Skip to content

Commit

Permalink
Remove unnecessary new keyword
Browse files Browse the repository at this point in the history
  • Loading branch information
marcojakob committed Dec 10, 2019
1 parent b93cba6 commit a6d0dd4
Show file tree
Hide file tree
Showing 22 changed files with 102 additions and 102 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog

## Version 1.4.3 (2019-12-10)

- Remove unnecessary new keyword.

## Version 1.4.2 (2019-02-13)

- Fix #30: Cannot initialize Dropzone with List<HtmlElement>.
Expand Down
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -39,10 +39,10 @@ If you also want to drop somewhere, you'll need a `Dropzone`.

```dart
// Install draggable (no avatar).
Draggable draggable = new Draggable(querySelectorAll('.draggable'));
Draggable draggable = Draggable(querySelectorAll('.draggable'));
// Install dropzone.
Dropzone dropzone = new Dropzone(querySelector('.dropzone'));
Dropzone dropzone = Dropzone(querySelector('.dropzone'));
```

You'll most likely want some **drag avatar** to show the user that a drag is
Expand All @@ -51,13 +51,13 @@ But you could also provide your own implementation of `AvatarHandler`.

```dart
// Draggable with clone as avatar.
Draggable draggable = new Draggable(querySelectorAll('.draggable'),
avatarHandler: new AvatarHandler.clone());
Draggable draggable = Draggable(querySelectorAll('.draggable'),
avatarHandler: AvatarHandler.clone());
// Draggable with original element as avatar.
Draggable draggable = new Draggable(querySelectorAll('.draggable'),
avatarHandler: new AvatarHandler.original());
Draggable draggable = Draggable(querySelectorAll('.draggable'),
avatarHandler: AvatarHandler.original());
```

### Draggable Options
Expand All @@ -70,9 +70,9 @@ The following options can be passed as _named parameters_ to the constructor of
are possible options (see above for an example):

- `null` (the default) - will not create a drag avatar
- `new AvatarHandler.original()` - handler that uses the original
- `AvatarHandler.original()` - handler that uses the original
draggable as avatar. See `OriginalAvatarHandler`.
- `new AvatarHandler.clone()` - handler that uses a clone of the draggable
- `AvatarHandler.clone()` - handler that uses a clone of the draggable
element as avatar. See `CloneAvatarHandler`.
- A custom `AvatarHandler` - you can provide your own implementation of
`AvatarHandler`.
Expand Down
6 changes: 3 additions & 3 deletions example/basic/example.dart
Expand Up @@ -5,11 +5,11 @@ import 'package:dnd/dnd.dart';
/// A basic example of how to use [Draggable]s and [Dropzone]s together.
main() {
// Install draggables (documents).
new Draggable(querySelectorAll('.document'),
avatarHandler: new AvatarHandler.clone());
Draggable(querySelectorAll('.document'),
avatarHandler: AvatarHandler.clone());

// Install dropzone (trash).
Dropzone dropzone = new Dropzone(querySelector('.trash'));
Dropzone dropzone = Dropzone(querySelector('.trash'));

// Remove the documents when dropped.
dropzone.onDrop.listen((DropzoneEvent event) {
Expand Down
4 changes: 2 additions & 2 deletions example/cancel/example.dart
Expand Up @@ -4,7 +4,7 @@ import 'package:dnd/dnd.dart';
/// Example demonstrating how dragging can be prevented on some elements.
main() {
// Install draggable.
new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original(),
Draggable(querySelector('.draggable'),
avatarHandler: AvatarHandler.original(),
cancel: 'textarea, button, .no-drag');
}
20 changes: 10 additions & 10 deletions example/custom_acceptor/example.dart
Expand Up @@ -4,23 +4,23 @@ import 'package:dnd/dnd.dart';
/// Uses Acceptors to determine which Draggables are accepted by which Dropzones.
main() {
// Install draggables.
new Draggable(querySelector('#draggable-a'),
avatarHandler: new AvatarHandler.clone());
var draggableB = new Draggable(querySelector('#draggable-b'),
avatarHandler: new AvatarHandler.clone());
new Draggable(querySelector('#draggable-c'),
avatarHandler: new AvatarHandler.clone());
Draggable(querySelector('#draggable-a'),
avatarHandler: AvatarHandler.clone());
var draggableB = Draggable(querySelector('#draggable-b'),
avatarHandler: AvatarHandler.clone());
Draggable(querySelector('#draggable-c'),
avatarHandler: AvatarHandler.clone());

// No acceptor means everything is accepted.
new Dropzone(querySelector('#dropzone-1'));
Dropzone(querySelector('#dropzone-1'));

// Use provided DraggablesAcceptor to accept Draggable B only.
new Dropzone(querySelector('#dropzone-2'),
acceptor: new Acceptor.draggables([draggableB]));
Dropzone(querySelector('#dropzone-2'),
acceptor: Acceptor.draggables([draggableB]));

// Use a custom Acceptor that accepts Draggables with a input containing
// the text 'acceptme'.
new Dropzone(querySelector('#dropzone-3'), acceptor: new MyAcceptor());
Dropzone(querySelector('#dropzone-3'), acceptor: MyAcceptor());
}

/**
Expand Down
23 changes: 12 additions & 11 deletions example/custom_avatar/example.dart
Expand Up @@ -9,12 +9,12 @@ import 'package:dnd/dnd.dart';
/// See [MyAvatarHandler].
main() {
// Install draggables.
Draggable draggable = new Draggable(querySelectorAll('.document'),
avatarHandler: new MyAvatarHandler());
Draggable draggable = Draggable(querySelectorAll('.document'),
avatarHandler: MyAvatarHandler());

// Install dropzone (trash).
Element trash = querySelector('.trash');
Dropzone dropzone = new Dropzone(trash);
Dropzone dropzone = Dropzone(trash);

// Keep track if we're over the trash.
bool overTrash = false;
Expand All @@ -34,7 +34,8 @@ main() {
handler.updateImage(4);
} else {
// Set image depending on distance to trash.
int imageNumber = calcImageNumber(trash, event.startPosition, event.position);
int imageNumber =
calcImageNumber(trash, event.startPosition, event.position);
handler.updateImage(imageNumber);
}
});
Expand All @@ -50,29 +51,29 @@ main() {
///
/// The [MyAvatarHandler] creates changing smiley images as drag avatar.
class MyAvatarHandler extends AvatarHandler {

/// List of smiley src urls.
static final List<String> SMILEYS = [
'images/smiley02.png',
'images/smiley03.png',
'images/smiley04.png',
'images/smiley05.png',
'images/smiley06.png'];
'images/smiley06.png'
];

/// Define an offset for the avatar relative to the mouse cursor.
static const Point OFFSET = const Point(-64, -130);

MyAvatarHandler() {
// Preload avatar images.
SMILEYS.forEach((s) {
new ImageElement(src: s);
ImageElement(src: s);
});
}

@override
void dragStart(Element draggable, Point startPosition) {
// Use first image as avatar.
avatar = new ImageElement(src: SMILEYS[0]);
avatar = ImageElement(src: SMILEYS[0]);

// Set the initial position of avatar.
setLeftTop(startPosition + OFFSET);
Expand Down Expand Up @@ -103,8 +104,8 @@ class MyAvatarHandler extends AvatarHandler {
/// Calculates the image number depending on the distance to [trash].
int calcImageNumber(Element trash, Point startPosition, Point position) {
var trashDim = trash.borderEdge;
Point trashCenter = new Point(trashDim.left + trashDim.width / 2,
trashDim.top + trashDim.height / 2);
Point trashCenter = Point(
trashDim.left + trashDim.width / 2, trashDim.top + trashDim.height / 2);

// Set image depending on distance to trash.
double remainingDistance = position.distanceTo(trashCenter) - 64;
Expand All @@ -114,4 +115,4 @@ int calcImageNumber(Element trash, Point startPosition, Point position) {
distancePercent = math.min(1, distancePercent);

return 3 - (3 * distancePercent).round();
}
}
6 changes: 3 additions & 3 deletions example/detection_only/example.dart
Expand Up @@ -7,7 +7,7 @@ import 'package:dnd/dnd.dart';
/// Use this if you want to implement your own custom dragging behavior.
main() {
// Install draggable.
Draggable draggable = new Draggable(querySelector('.draggable'));
Draggable draggable = Draggable(querySelector('.draggable'));

// Paragraph.
Element p = querySelector('.draggable p');
Expand All @@ -29,5 +29,5 @@ main() {
}

Point round(Point point) {
return new Point(point.x.round(), point.y.round());
}
return Point(point.x.round(), point.y.round());
}
2 changes: 1 addition & 1 deletion example/free_dragging/example.dart
Expand Up @@ -6,5 +6,5 @@ import 'package:dnd/dnd.dart';
main() {
// Install draggable.
Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original());
avatarHandler: AvatarHandler.original());
}
2 changes: 1 addition & 1 deletion example/handle/example.dart
Expand Up @@ -5,5 +5,5 @@ import 'package:dnd/dnd.dart';
main() {
// Install draggable.
Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original(), handle: '.handle');
avatarHandler: AvatarHandler.original(), handle: '.handle');
}
4 changes: 2 additions & 2 deletions example/horizontal_only/example.dart
Expand Up @@ -6,6 +6,6 @@ import 'package:dnd/dnd.dart';
/// it is ignored and thus can be used for scrolling on touch devices.
main() {
// Install draggable.
new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original(), horizontalOnly: true);
Draggable(querySelector('.draggable'),
avatarHandler: AvatarHandler.original(), horizontalOnly: true);
}
11 changes: 5 additions & 6 deletions example/nested_dropzones/example.dart
Expand Up @@ -7,12 +7,12 @@ import 'package:dnd/dnd.dart';
/// receive the drop event.
main() {
// Install draggable.
Draggable draggable = new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original());
Draggable draggable = Draggable(querySelector('.draggable'),
avatarHandler: AvatarHandler.original());

// Install dropzones.
Dropzone outerDropzone = new Dropzone(querySelector('.dropzone-outer'));
Dropzone innerDropzone = new Dropzone(querySelector('.dropzone-inner'));
Dropzone outerDropzone = Dropzone(querySelector('.dropzone-outer'));
Dropzone innerDropzone = Dropzone(querySelector('.dropzone-inner'));

// The text elements.
Element draggableText = querySelector('.draggable > p');
Expand Down Expand Up @@ -48,7 +48,6 @@ main() {
}
});


// Listen to drop.
outerDropzone.onDrop.listen((DropzoneEvent event) {
outerDropped = true;
Expand All @@ -65,4 +64,4 @@ main() {
outerText.text = 'Outer Dropzone';
innerText.text = 'Inner Dropzone';
});
}
}
6 changes: 3 additions & 3 deletions example/nested_elements/example.dart
Expand Up @@ -5,11 +5,11 @@ import 'package:dnd/dnd.dart';
/// dragEnter and dragLeave events.
main() {
// Install draggable.
new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.original());
Draggable(querySelector('.draggable'),
avatarHandler: AvatarHandler.original());

// Install dropzone.
Dropzone dropzone = new Dropzone(querySelector('.dropzone'));
Dropzone dropzone = Dropzone(querySelector('.dropzone'));

// Text element
Element text = querySelector('.dropzone > span');
Expand Down
3 changes: 1 addition & 2 deletions example/parent_offset/example.dart
Expand Up @@ -4,6 +4,5 @@ import 'package:dnd/dnd.dart';
/// A test with a draggable that has a parent with offset > 0.
main() {
// Install draggable.
new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.clone());
Draggable(querySelector('.draggable'), avatarHandler: AvatarHandler.clone());
}
5 changes: 2 additions & 3 deletions example/scroll_offset/example.dart
Expand Up @@ -4,9 +4,8 @@ import 'package:dnd/dnd.dart';
/// A test with a draggable that has a scrollable parent.
main() {
// Install draggable.
new Draggable(querySelector('.draggable'),
avatarHandler: new AvatarHandler.clone());
Draggable(querySelector('.draggable'), avatarHandler: AvatarHandler.clone());

// Install dropzone.
new Dropzone(querySelector('.dropzone'));
Dropzone(querySelector('.dropzone'));
}
6 changes: 3 additions & 3 deletions example/simple_sortable/example.dart
Expand Up @@ -5,10 +5,10 @@ import 'package:dnd/dnd.dart';
/// and implement some basic sortable/rearranging behavior.
main() {
// Install same elements as draggable and dropzone.
new Draggable(querySelectorAll('.sortable'),
avatarHandler: new AvatarHandler.clone());
Draggable(querySelectorAll('.sortable'),
avatarHandler: AvatarHandler.clone());

Dropzone dropzone = new Dropzone(querySelectorAll('.sortable'));
Dropzone dropzone = Dropzone(querySelectorAll('.sortable'));

// Swap elements when dropped.
dropzone.onDrop.listen((DropzoneEvent event) {
Expand Down

0 comments on commit a6d0dd4

Please sign in to comment.