From a6d0dd422fd6eca870b993f42577b93193051309 Mon Sep 17 00:00:00 2001 From: Marco Jakob Date: Tue, 10 Dec 2019 21:03:13 +0100 Subject: [PATCH] Remove unnecessary new keyword --- CHANGELOG.md | 4 ++++ README.md | 16 +++++++------- example/basic/example.dart | 6 ++--- example/cancel/example.dart | 4 ++-- example/custom_acceptor/example.dart | 20 ++++++++--------- example/custom_avatar/example.dart | 23 ++++++++++--------- example/detection_only/example.dart | 6 ++--- example/free_dragging/example.dart | 2 +- example/handle/example.dart | 2 +- example/horizontal_only/example.dart | 4 ++-- example/nested_dropzones/example.dart | 11 +++++---- example/nested_elements/example.dart | 6 ++--- example/parent_offset/example.dart | 3 +-- example/scroll_offset/example.dart | 5 ++--- example/simple_sortable/example.dart | 6 ++--- lib/src/draggable.dart | 32 +++++++++++++-------------- lib/src/draggable_avatar.dart | 6 ++--- lib/src/draggable_dispatch.dart | 20 ++++++++--------- lib/src/draggable_manager.dart | 2 +- lib/src/dropzone.dart | 20 ++++++++--------- lib/src/dropzone_acceptor.dart | 4 ++-- pubspec.yaml | 2 +- 22 files changed, 102 insertions(+), 102 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92cffb8..f7b9878 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index 4058c01..00069a0 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 @@ -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`. diff --git a/example/basic/example.dart b/example/basic/example.dart index a2207d7..acfafdc 100644 --- a/example/basic/example.dart +++ b/example/basic/example.dart @@ -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) { diff --git a/example/cancel/example.dart b/example/cancel/example.dart index 1adae0b..5898859 100644 --- a/example/cancel/example.dart +++ b/example/cancel/example.dart @@ -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'); } diff --git a/example/custom_acceptor/example.dart b/example/custom_acceptor/example.dart index 653689a..8bec813 100644 --- a/example/custom_acceptor/example.dart +++ b/example/custom_acceptor/example.dart @@ -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()); } /** diff --git a/example/custom_avatar/example.dart b/example/custom_avatar/example.dart index 668baa2..a689f77 100644 --- a/example/custom_avatar/example.dart +++ b/example/custom_avatar/example.dart @@ -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; @@ -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); } }); @@ -50,14 +51,14 @@ main() { /// /// The [MyAvatarHandler] creates changing smiley images as drag avatar. class MyAvatarHandler extends AvatarHandler { - /// List of smiley src urls. static final List 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); @@ -65,14 +66,14 @@ class MyAvatarHandler extends AvatarHandler { 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); @@ -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; @@ -114,4 +115,4 @@ int calcImageNumber(Element trash, Point startPosition, Point position) { distancePercent = math.min(1, distancePercent); return 3 - (3 * distancePercent).round(); -} \ No newline at end of file +} diff --git a/example/detection_only/example.dart b/example/detection_only/example.dart index d747a76..51578b2 100644 --- a/example/detection_only/example.dart +++ b/example/detection_only/example.dart @@ -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'); @@ -29,5 +29,5 @@ main() { } Point round(Point point) { - return new Point(point.x.round(), point.y.round()); -} \ No newline at end of file + return Point(point.x.round(), point.y.round()); +} diff --git a/example/free_dragging/example.dart b/example/free_dragging/example.dart index 79b825e..e6f8a83 100644 --- a/example/free_dragging/example.dart +++ b/example/free_dragging/example.dart @@ -6,5 +6,5 @@ import 'package:dnd/dnd.dart'; main() { // Install draggable. Draggable(querySelector('.draggable'), - avatarHandler: new AvatarHandler.original()); + avatarHandler: AvatarHandler.original()); } diff --git a/example/handle/example.dart b/example/handle/example.dart index dcc5743..0ff0b25 100644 --- a/example/handle/example.dart +++ b/example/handle/example.dart @@ -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'); } diff --git a/example/horizontal_only/example.dart b/example/horizontal_only/example.dart index 5a088eb..04b30df 100644 --- a/example/horizontal_only/example.dart +++ b/example/horizontal_only/example.dart @@ -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); } diff --git a/example/nested_dropzones/example.dart b/example/nested_dropzones/example.dart index abd4079..38b2ade 100644 --- a/example/nested_dropzones/example.dart +++ b/example/nested_dropzones/example.dart @@ -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'); @@ -48,7 +48,6 @@ main() { } }); - // Listen to drop. outerDropzone.onDrop.listen((DropzoneEvent event) { outerDropped = true; @@ -65,4 +64,4 @@ main() { outerText.text = 'Outer Dropzone'; innerText.text = 'Inner Dropzone'; }); -} \ No newline at end of file +} diff --git a/example/nested_elements/example.dart b/example/nested_elements/example.dart index 42d49a7..7864108 100644 --- a/example/nested_elements/example.dart +++ b/example/nested_elements/example.dart @@ -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'); diff --git a/example/parent_offset/example.dart b/example/parent_offset/example.dart index 24d8fa7..c110ab7 100644 --- a/example/parent_offset/example.dart +++ b/example/parent_offset/example.dart @@ -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()); } diff --git a/example/scroll_offset/example.dart b/example/scroll_offset/example.dart index b654edc..6bc878d 100644 --- a/example/scroll_offset/example.dart +++ b/example/scroll_offset/example.dart @@ -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')); } diff --git a/example/simple_sortable/example.dart b/example/simple_sortable/example.dart index 71654db..0820cc3 100644 --- a/example/simple_sortable/example.dart +++ b/example/simple_sortable/example.dart @@ -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) { diff --git a/lib/src/draggable.dart b/lib/src/draggable.dart index b08c8af..109a149 100644 --- a/lib/src/draggable.dart +++ b/lib/src/draggable.dart @@ -80,7 +80,7 @@ class Draggable { /// will also be fired. Stream get onDragStart { if (_onDragStart == null) { - _onDragStart = new StreamController.broadcast( + _onDragStart = StreamController.broadcast( sync: true, onCancel: () => _onDragStart = null); } return _onDragStart.stream; @@ -89,7 +89,7 @@ class Draggable { /// Fired periodically throughout the drag operation. Stream get onDrag { if (_onDrag == null) { - _onDrag = new StreamController.broadcast( + _onDrag = StreamController.broadcast( sync: true, onCancel: () => _onDrag = null); } return _onDrag.stream; @@ -99,7 +99,7 @@ class Draggable { /// Is also fired when the user clicks the 'esc'-key or the window loses focus. Stream get onDragEnd { if (_onDragEnd == null) { - _onDragEnd = new StreamController.broadcast( + _onDragEnd = StreamController.broadcast( sync: true, onCancel: () => _onDragEnd = null); } return _onDragEnd.stream; @@ -133,9 +133,9 @@ class Draggable { /// drag operation. Here are possible options for the [avatarHandler] : /// /// * 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]. @@ -177,18 +177,18 @@ class Draggable { : [elementOrElementList]; // Detect Pointer Event Support. - JsObject jsWindow = new JsObject.fromBrowserObject(window); + JsObject jsWindow = JsObject.fromBrowserObject(window); if (jsWindow.hasProperty('PointerEvent')) { // Browser with support for Pointer Events. - _eventManagers.add(new _PointerManager(this)); + _eventManagers.add(_PointerManager(this)); } else { // We're on a browser with no support for Pointer Events. // Install touch and mouse listeners. if (TouchEvent.supported) { - _eventManagers.add(new _TouchManager(this)); + _eventManagers.add(_TouchManager(this)); } - _eventManagers.add(new _MouseManager(this)); + _eventManagers.add(_MouseManager(this)); } } @@ -207,7 +207,7 @@ class Draggable { // Fire the drag start event with start position. if (_onDragStart != null) { // The dragStart has the same for startPosition and current position. - _onDragStart.add(new DraggableEvent._(moveEvent, _currentDrag)); + _onDragStart.add(DraggableEvent._(moveEvent, _currentDrag)); } // Add the css classes during the drag operation. @@ -239,7 +239,7 @@ class Draggable { // Fire the drag event. if (_onDrag != null) { - _onDrag.add(new DraggableEvent._(moveEvent, _currentDrag)); + _onDrag.add(DraggableEvent._(moveEvent, _currentDrag)); } } @@ -268,8 +268,8 @@ class Draggable { // Fire dragEnd event. if (_onDragEnd != null) { - _onDragEnd.add( - new DraggableEvent._(event, _currentDrag, cancelled: cancelled)); + _onDragEnd + .add(DraggableEvent._(event, _currentDrag, cancelled: cancelled)); } // Prevent TouchEvent from emulating a click after touchEnd event. @@ -306,7 +306,7 @@ class Draggable { // Wait until the end of event loop to see if a click event is fired. // Then cancel the listener. - new Future(() { + Future(() { clickPreventer.cancel(); }); } @@ -439,12 +439,12 @@ class _DragInfo { Point _constrainAxis(Point pos) { // Set y-value to startPosition if horizontalOnly. if (horizontalOnly) { - return new Point(pos.x, startPosition.y); + return Point(pos.x, startPosition.y); } // Set x-value to startPosition if verticalOnly. if (verticalOnly) { - return new Point(startPosition.x, pos.y); + return Point(startPosition.x, pos.y); } // Axis is not constrained. diff --git a/lib/src/draggable_avatar.dart b/lib/src/draggable_avatar.dart index 61cf5e0..a5621a9 100644 --- a/lib/src/draggable_avatar.dart +++ b/lib/src/draggable_avatar.dart @@ -42,7 +42,7 @@ abstract class AvatarHandler { /// /// See [OriginalAvatarHandler]. factory AvatarHandler.original() { - return new OriginalAvatarHandler(); + return OriginalAvatarHandler(); } /// Creates an [AvatarHelper] that creates a clone of the draggable element @@ -50,7 +50,7 @@ abstract class AvatarHandler { /// /// See [CloneAvatarHandler]. factory AvatarHandler.clone() { - return new CloneAvatarHandler(); + return CloneAvatarHandler(); } /// Handles the drag start. @@ -188,7 +188,7 @@ class OriginalAvatarHandler extends AvatarHandler { // Set the new position as left/top. Prevent from moving past the top and // left borders as the user might not be able to grab the element any more. Point constrainedPosition = - new Point(math.max(1, position.x), math.max(1, position.y)); + Point(math.max(1, position.x), math.max(1, position.y)); setLeftTop(constrainedPosition - startPosition + _draggableStartOffset); } diff --git a/lib/src/draggable_dispatch.dart b/lib/src/draggable_dispatch.dart index d7dfe8e..d36b48a 100644 --- a/lib/src/draggable_dispatch.dart +++ b/lib/src/draggable_dispatch.dart @@ -20,20 +20,20 @@ class _DragEventDispatcher { /// Stream provider for [CUSTOM_DRAG_ENTER] events. The relatedTarget contains /// the [Element] the user entered from (may be null). static EventStreamProvider enterEvent = - new EventStreamProvider(CUSTOM_DRAG_ENTER); + EventStreamProvider(CUSTOM_DRAG_ENTER); /// Stream provider for [CUSTOM_DRAG_OVER] events. The relatedTarget is empty. static EventStreamProvider overEvent = - new EventStreamProvider(CUSTOM_DRAG_OVER); + EventStreamProvider(CUSTOM_DRAG_OVER); /// Stream provider for [CUSTOM_DRAG_LEAVE] events. The relatedTarget contains /// the [Element] the user is leaving to (may be null). static EventStreamProvider leaveEvent = - new EventStreamProvider(CUSTOM_DRAG_LEAVE); + EventStreamProvider(CUSTOM_DRAG_LEAVE); /// Stream provider for [CUSTOM_DROP] events. The relatedTarget is empty. static EventStreamProvider dropEvent = - new EventStreamProvider(CUSTOM_DROP); + EventStreamProvider(CUSTOM_DROP); /// Keeps track of the previous target to be able to fire dragLeave events on it. static EventTarget previousTarget; @@ -51,23 +51,23 @@ class _DragEventDispatcher { if (previousTarget == target) { // Moved on the same element --> dispatch dragOver. - MouseEvent dragOverEvent = new MouseEvent(CUSTOM_DRAG_OVER); + MouseEvent dragOverEvent = MouseEvent(CUSTOM_DRAG_OVER); target.dispatchEvent(dragOverEvent); } else { // Entered a new element --> fire dragEnter of new element. MouseEvent dragEnterEvent = - new MouseEvent(CUSTOM_DRAG_ENTER, relatedTarget: previousTarget); + MouseEvent(CUSTOM_DRAG_ENTER, relatedTarget: previousTarget); target.dispatchEvent(dragEnterEvent); // Fire dragLeave of old element (if there is one). if (previousTarget != null) { MouseEvent dragLeaveEvent = - new MouseEvent(CUSTOM_DRAG_LEAVE, relatedTarget: target); + MouseEvent(CUSTOM_DRAG_LEAVE, relatedTarget: target); previousTarget.dispatchEvent(dragLeaveEvent); } // Also fire the first dragOver event for the new element. - MouseEvent dragOverEvent = new MouseEvent(CUSTOM_DRAG_OVER); + MouseEvent dragOverEvent = MouseEvent(CUSTOM_DRAG_OVER); target.dispatchEvent(dragOverEvent); previousTarget = target; @@ -85,7 +85,7 @@ class _DragEventDispatcher { return; } - MouseEvent dropEvent = new MouseEvent(CUSTOM_DROP); + MouseEvent dropEvent = MouseEvent(CUSTOM_DROP); target.dispatchEvent(dropEvent); reset(); @@ -95,7 +95,7 @@ class _DragEventDispatcher { static void reset() { // Fire a last dragLeave. if (previousTarget != null) { - MouseEvent dragLeaveEvent = new MouseEvent(CUSTOM_DRAG_LEAVE); + MouseEvent dragLeaveEvent = MouseEvent(CUSTOM_DRAG_LEAVE); previousTarget.dispatchEvent(dragLeaveEvent); previousTarget = null; } diff --git a/lib/src/draggable_manager.dart b/lib/src/draggable_manager.dart index 0ef3045..261a305 100644 --- a/lib/src/draggable_manager.dart +++ b/lib/src/draggable_manager.dart @@ -69,7 +69,7 @@ abstract class _EventManager { void handleStart(Event event, Point position) { // Initialize the drag info. // Note: the drag is not started on touchStart but after a first valid move. - _currentDrag = new _DragInfo(drg.id, event.currentTarget, position, + _currentDrag = _DragInfo(drg.id, event.currentTarget, position, avatarHandler: drg.avatarHandler, horizontalOnly: drg.horizontalOnly, verticalOnly: drg.verticalOnly); diff --git a/lib/src/dropzone.dart b/lib/src/dropzone.dart index 66aeb5d..f18df08 100644 --- a/lib/src/dropzone.dart +++ b/lib/src/dropzone.dart @@ -39,7 +39,7 @@ class Dropzone { /// Fired when a [Draggable] enters this [Dropzone]. Stream get onDragEnter { if (_onDragEnter == null) { - _onDragEnter = new StreamController.broadcast( + _onDragEnter = StreamController.broadcast( sync: true, onCancel: () => _onDragEnter = null); } return _onDragEnter.stream; @@ -48,7 +48,7 @@ class Dropzone { /// Fired periodically while a [Draggable] is moved over a [Dropzone]. Stream get onDragOver { if (_onDragOver == null) { - _onDragOver = new StreamController.broadcast( + _onDragOver = StreamController.broadcast( sync: true, onCancel: () => _onDragOver = null); } return _onDragOver.stream; @@ -57,7 +57,7 @@ class Dropzone { /// Fired when a [Draggable] leaves this [Dropzone]. Stream get onDragLeave { if (_onDragLeave == null) { - _onDragLeave = new StreamController.broadcast( + _onDragLeave = StreamController.broadcast( sync: true, onCancel: () => _onDragLeave = null); } return _onDragLeave.stream; @@ -67,7 +67,7 @@ class Dropzone { /// inside this [Dropzone]. Stream get onDrop { if (_onDrop == null) { - _onDrop = new StreamController.broadcast( + _onDrop = StreamController.broadcast( sync: true, onCancel: () => _onDrop = null); } return _onDrop.stream; @@ -82,7 +82,7 @@ class Dropzone { /// Tracks subscriptions. List _subs = []; - /// Creates a new [Dropzone] for [elementOrElementList]. The + /// Creates a [Dropzone] for [elementOrElementList]. The /// [elementOrElementList] must be of type [Element] or [ElementList]. /// /// ## Options @@ -142,8 +142,7 @@ class Dropzone { event.currentTarget)) { // Fire dragEnter event. if (_onDragEnter != null) { - _onDragEnter - .add(new DropzoneEvent._(event.currentTarget, _currentDrag)); + _onDragEnter.add(DropzoneEvent._(event.currentTarget, _currentDrag)); } // Add the css class to indicate drag over. @@ -167,7 +166,7 @@ class Dropzone { event.currentTarget)) { // Fire dragOver event. if (_onDragOver != null) { - _onDragOver.add(new DropzoneEvent._(event.currentTarget, _currentDrag)); + _onDragOver.add(DropzoneEvent._(event.currentTarget, _currentDrag)); } } } @@ -188,8 +187,7 @@ class Dropzone { event.currentTarget)) { // Fire dragLeave event. if (_onDragLeave != null) { - _onDragLeave - .add(new DropzoneEvent._(event.currentTarget, _currentDrag)); + _onDragLeave.add(DropzoneEvent._(event.currentTarget, _currentDrag)); } // Remove the css class. @@ -213,7 +211,7 @@ class Dropzone { event.currentTarget)) { // Fire drop event. if (_onDrop != null) { - _onDrop.add(new DropzoneEvent._(event.currentTarget, _currentDrag)); + _onDrop.add(DropzoneEvent._(event.currentTarget, _currentDrag)); } } } diff --git a/lib/src/dropzone_acceptor.dart b/lib/src/dropzone_acceptor.dart index 3a90011..546a136 100644 --- a/lib/src/dropzone_acceptor.dart +++ b/lib/src/dropzone_acceptor.dart @@ -9,7 +9,7 @@ abstract class Acceptor { /// /// See [DraggablesAcceptor]. factory Acceptor.draggables(List draggables) { - return new DraggablesAcceptor(draggables); + return DraggablesAcceptor(draggables); } /// Returns true if the [draggableElement] with [draggableId] should be @@ -21,7 +21,7 @@ abstract class Acceptor { /// The [DraggablesAcceptor] accepts all drag elements that are part of the /// specified list of [Draggable]s. class DraggablesAcceptor extends Acceptor { - final Set draggableIds = new Set(); + final Set draggableIds = Set(); DraggablesAcceptor(List draggables) { draggables.forEach((d) => draggableIds.add(d.id)); diff --git a/pubspec.yaml b/pubspec.yaml index 1ee0b4b..978d59a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: dnd -version: 1.4.2 +version: 1.4.3 author: Marco Jakob description: Drag and Drop for Dart web apps with mouse and touch support. repository: https://github.com/marcojakob/dart-dnd