dnd.js: Use es6 class for _Draggable.

Author: mtwebster

js/ui/dnd.js

@@ -5,7 +5,6 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
-const Lang = imports.lang;
 const Cinnamon = imports.gi.Cinnamon;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;
@@ -77,10 +76,8 @@ function isDragging() {
     return currentDraggable != null;
 }
 
-var _Draggable = new Lang.Class({
-    Name: 'Draggable',
-
-    _init : function(actor, params, target) {
+var _Draggable = class Draggable {
+    constructor(actor, params, target) {
         params = Params.parse(params, { manualMode: false,
                                         restoreOnSuccess: false,
                                         overrideX: undefined,
@@ -105,15 +102,15 @@ var _Draggable = new Lang.Class({
 
         if (!params.manualMode)
             this.buttonPressEventId = this.actor.connect('button-press-event',
-                                                    Lang.bind(this, this._onButtonPress));
+                                                    this._onButtonPress.bind(this));
 
-        this.destroyEventId = this.actor.connect('destroy', Lang.bind(this, function() {
+        this.destroyEventId = this.actor.connect('destroy', () => {
             this._actorDestroyed = true;
 
             if (this._dragInProgress && this._dragCancellable)
                 this._cancelDrag(null);
             this.disconnectAll();
-        }));
+        });
         this._onEventId = null;
 
         this._restoreOnSuccess = params.restoreOnSuccess;
@@ -128,9 +125,9 @@ var _Draggable = new Lang.Class({
         this._dragCancellable = true;
 
         this._eventsGrabbed = false;
-    },
+    }
 
-    _onButtonPress : function (actor, event) {
+    _onButtonPress(actor, event) {
         if (this.inhibit)
             return false;
 
@@ -157,16 +154,16 @@ var _Draggable = new Lang.Class({
         this._dragStartY = stageY;
 
         return false;
-    },
+    }
 
-    _grabActor: function(event) {
+    _grabActor(event) {
         this.drag_device = event.get_device();
         this.drag_device.grab(this.actor);
         this._onEventId = this.actor.connect('event',
-                                             Lang.bind(this, this._onEvent));
-    },
+                                             this._onEvent.bind(this));
+    }
 
-    _ungrabActor: function(event) {
+    _ungrabActor(event) {
         if (!this._onEventId)
             return;
 
@@ -178,27 +175,27 @@ var _Draggable = new Lang.Class({
 
         this.actor.disconnect(this._onEventId);
         this._onEventId = null;
-    },
+    }
 
-    _grabEvents: function(event) {
+    _grabEvents(event) {
         if (!this._eventsGrabbed) {
             this._eventsGrabbed = Main.pushModal(_getEventHandlerActor(), undefined, undefined, Cinnamon.ActionMode.NORMAL);
             if (this._eventsGrabbed) {
                 this.drag_device = event.get_device()
                 this.drag_device.grab(_getEventHandlerActor());
             }
         }
-    },
+    }
 
-    _ungrabEvents: function() {
+    _ungrabEvents() {
         if (this._eventsGrabbed) {
             this.drag_device.ungrab();
             Main.popModal(_getEventHandlerActor());
             this._eventsGrabbed = false;
         }
-    },
+    }
 
-    _onEvent: function(actor, event) {
+    _onEvent(actor, event) {
         // We intercept BUTTON_RELEASE event to know that the button was released in case we
         // didn't start the drag, to drop the draggable in case the drag was in progress, and
         // to complete the drag and ensure that whatever happens to be under the pointer does
@@ -239,7 +236,7 @@ var _Draggable = new Lang.Class({
         }
 
         return false;
-    },
+    }
 
     /**
      * fakeRelease:
@@ -249,10 +246,10 @@ var _Draggable = new Lang.Class({
      * actors for other purposes (for example if you're using
      * PopupMenu.ignoreRelease())
      */
-    fakeRelease: function() {
+    fakeRelease() {
         this._buttonDown = false;
         this._ungrabActor();
-    },
+    }
 
     /**
      * startDrag:
@@ -264,7 +261,7 @@ var _Draggable = new Lang.Class({
      * This function is useful to call if you've specified manualMode
      * for the draggable.
      */
-    startDrag: function (stageX, stageY, event) {
+    startDrag(stageX, stageY, event) {
         currentDraggable = this;
         this._dragInProgress = true;
 
@@ -378,9 +375,9 @@ var _Draggable = new Lang.Class({
                 });
             }
         }
-    },
+    }
 
-    _maybeStartDrag:  function(event) {
+    _maybeStartDrag(event) {
         let [stageX, stageY] = event.get_coords();
 
         // See if the user has moved the mouse enough to trigger a drag
@@ -392,9 +389,9 @@ var _Draggable = new Lang.Class({
         }
 
         return true;
-    },
+    }
 
-    _updateDragHover : function () {
+    _updateDragHover() {
         this._updateHoverId = 0;
         let target = null;
         let result = null;
@@ -459,17 +456,17 @@ var _Draggable = new Lang.Class({
         if (result in DRAG_CURSOR_MAP) global.set_cursor(DRAG_CURSOR_MAP[result]);
         else global.set_cursor(Cinnamon.Cursor.NO_DROP);
         return false;
-    },
+    }
 
-    _queueUpdateDragHover: function() {
+    _queueUpdateDragHover() {
         if (this._updateHoverId)
             return;
 
         this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
-                                            Lang.bind(this, this._updateDragHover));
-    },
+                                            this._updateDragHover.bind(this));
+    }
 
-    _updateDragPosition : function (event) {
+    _updateDragPosition(event) {
         let [stageX, stageY] = event.get_coords();
         this._dragX = stageX;
         this._dragY = stageY;
@@ -478,17 +475,17 @@ var _Draggable = new Lang.Class({
 
         this._queueUpdateDragHover();
         return true;
-    },
+    }
 
-    _setDragActorPosition: function() {
+    _setDragActorPosition() {
         this._dragActor.x = this._overrideX == undefined ?
             this._dragX + this._dragOffsetX : this._overrideX;
 
         this._dragActor.y = this._overrideY == undefined ?
             this._dragY + this._dragOffsetY : this._overrideY;
-    },
+    }
 
-    _dragActorDropped: function(event) {
+    _dragActorDropped(event) {
         let [dropX, dropY] = event.get_coords();
         let target = null;
 
@@ -557,9 +554,9 @@ var _Draggable = new Lang.Class({
         this._cancelDrag(event);
 
         return true;
-    },
+    }
 
-    _getRestoreLocation: function() {
+    _getRestoreLocation() {
         let x, y, scale;
 
         if (this._dragActorSource && this._dragActorSource.visible) {
@@ -589,9 +586,9 @@ var _Draggable = new Lang.Class({
         }
 
         return [x, y, scale];
-    },
+    }
 
-    _cancelDrag: function(event) {
+    _cancelDrag(event) {
         let eventTime;
         if (event !== null) {
             eventTime = event.get_time();
@@ -627,9 +624,9 @@ var _Draggable = new Lang.Class({
                 this._onAnimationComplete(this._dragActor, eventTime);
             }
         });
-    },
+    }
 
-    _restoreDragActor: function(eventTime) {
+    _restoreDragActor(eventTime) {
         this._dragInProgress = false;
         let [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
 
@@ -648,9 +645,9 @@ var _Draggable = new Lang.Class({
                 this._onAnimationComplete(this._dragActor, eventTime);
             }
         });
-    },
+    }
 
-    _onAnimationComplete : function (dragActor, eventTime) {
+    _onAnimationComplete(dragActor, eventTime) {
         if (this._dragOrigParent) {
             global.reparentActor (dragActor, this._dragOrigParent);
             dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
@@ -664,9 +661,9 @@ var _Draggable = new Lang.Class({
         this._animationInProgress = false;
         if (!this._buttonDown)
             this._dragComplete();
-    },
+    }
 
-    _dragComplete: function() {
+    _dragComplete() {
         if (this._dragOrigParent)
             Cinnamon.util_set_hidden_from_pick(this._dragActor, false);
 
@@ -681,7 +678,7 @@ var _Draggable = new Lang.Class({
         this._dragActor = undefined;
         currentDraggable = null;
     }
-});
+};
 
 Signals.addSignalMethods(_Draggable.prototype);