бабл для драга определяем на этапе клика мышки

Katochimoto · Nov 29, 2016 · 473c61c · 473c61c
1 parent 52fe96f
commit 473c61c
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 38 deletions.
diff --git a/dist/x-bubbles-compact.js b/dist/x-bubbles-compact.js
@@ -2115,11 +2115,12 @@ var XBubbles =
 	    nodeSet.focus();
 
 	    var drag = nodeSet.__drag__ = {
-	        onMouseup: onMouseup.bind(this, nodeSet),
-	        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
-	        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
+	        nodeBubble: nodeBubble,
 	        nodeOffsetX: event.offsetX,
 	        nodeOffsetY: event.offsetY,
+	        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
+	        onMouseup: onMouseup.bind(this, nodeSet),
+	        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
 	        x: 0,
 	        y: 0
 	    };
@@ -2181,7 +2182,7 @@ var XBubbles =
 	    }
 	}
 
-	function onMousemove(dragSet, event) {
+	function onMousemove(dragSet) {
 	    var drag = dragSet.__drag__;
 	    if (!drag) {
 	        return;
@@ -2193,15 +2194,12 @@ var XBubbles =
 
 	        currentDragSet = dragSet;
 	        currentDragSet.classList.add(CLS.DRAGSTART);
+	        select.add(drag.nodeBubble);
 
-	        var nodeBubble = bubbleset.closestNodeBubble(event.target);
 	        var moveElement = void 0;
 
-	        if (nodeBubble) {
-	            select.add(nodeBubble);
-	            if (select.get(currentDragSet).length === 1) {
-	                moveElement = nodeBubble.cloneNode(true);
-	            }
+	        if (select.get(currentDragSet).length === 1) {
+	            moveElement = drag.nodeBubble.cloneNode(true);
 	        }
 
 	        if (!moveElement) {

diff --git a/dist/x-bubbles-compact.min.js b/dist/x-bubbles-compact.min.js
diff --git a/dist/x-bubbles-compact.min.js.map b/dist/x-bubbles-compact.min.js.map
diff --git a/dist/x-bubbles.js b/dist/x-bubbles.js
@@ -2115,11 +2115,12 @@ var XBubbles =
 	    nodeSet.focus();
 
 	    var drag = nodeSet.__drag__ = {
-	        onMouseup: onMouseup.bind(this, nodeSet),
-	        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
-	        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
+	        nodeBubble: nodeBubble,
 	        nodeOffsetX: event.offsetX,
 	        nodeOffsetY: event.offsetY,
+	        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
+	        onMouseup: onMouseup.bind(this, nodeSet),
+	        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
 	        x: 0,
 	        y: 0
 	    };
@@ -2181,7 +2182,7 @@ var XBubbles =
 	    }
 	}
 
-	function onMousemove(dragSet, event) {
+	function onMousemove(dragSet) {
 	    var drag = dragSet.__drag__;
 	    if (!drag) {
 	        return;
@@ -2193,15 +2194,12 @@ var XBubbles =
 
 	        currentDragSet = dragSet;
 	        currentDragSet.classList.add(CLS.DRAGSTART);
+	        select.add(drag.nodeBubble);
 
-	        var nodeBubble = bubbleset.closestNodeBubble(event.target);
 	        var moveElement = void 0;
 
-	        if (nodeBubble) {
-	            select.add(nodeBubble);
-	            if (select.get(currentDragSet).length === 1) {
-	                moveElement = nodeBubble.cloneNode(true);
-	            }
+	        if (select.get(currentDragSet).length === 1) {
+	            moveElement = drag.nodeBubble.cloneNode(true);
 	        }
 
 	        if (!moveElement) {

diff --git a/dist/x-bubbles.min.js b/dist/x-bubbles.min.js
diff --git a/dist/x-bubbles.min.js.map b/dist/x-bubbles.min.js.map
diff --git a/docs/x-bubbles.min.js b/docs/x-bubbles.min.js
diff --git a/docs/x-bubbles.min.js.map b/docs/x-bubbles.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "x-bubbles",
   "description": "Bubbles",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "keywords": [],
   "homepage": "https://github.com/Katochimoto/x-bubbles",
   "author": {

diff --git a/src/core/drag/mouse.js b/src/core/drag/mouse.js
@@ -34,13 +34,14 @@ function onMousedown(event) {
     nodeSet.focus();
 
     const drag = nodeSet.__drag__ = {
-        onMouseup: onMouseup.bind(this, nodeSet),
-        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
-        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
+        nodeBubble: nodeBubble,
         nodeOffsetX: event.offsetX,
         nodeOffsetY: event.offsetY,
+        onMousemove: utils.throttle(onMousemove.bind(this, nodeSet)),
+        onMouseup: onMouseup.bind(this, nodeSet),
+        onScroll: utils.throttle(onScroll.bind(this, nodeSet)),
         x: 0,
-        y: 0
+        y: 0,
     };
 
     currentDragSet = null;
@@ -96,7 +97,7 @@ function onMouseup(dragSet, event) {
     }
 }
 
-function onMousemove(dragSet, event) {
+function onMousemove(dragSet) {
     const drag = dragSet.__drag__;
     if (!drag) {
         return;
@@ -108,15 +109,12 @@ function onMousemove(dragSet, event) {
 
         currentDragSet = dragSet;
         currentDragSet.classList.add(CLS.DRAGSTART);
+        select.add(drag.nodeBubble);
 
-        const nodeBubble = bubbleset.closestNodeBubble(event.target);
         let moveElement;
 
-        if (nodeBubble) {
-            select.add(nodeBubble);
-            if (select.get(currentDragSet).length === 1) {
-                moveElement = nodeBubble.cloneNode(true);
-            }
+        if (select.get(currentDragSet).length === 1) {
+            moveElement = drag.nodeBubble.cloneNode(true);
         }
 
         if (!moveElement) {