fix: revert duplicate dragging fix as it caused worse errors

mattlewis92 · Dec 10, 2016 · 7476301 · 7476301
1 parent 455de31
commit 7476301
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/src/draggable.directive.ts b/src/draggable.directive.ts
@@ -120,29 +120,15 @@ export class Draggable implements OnInit, OnDestroy {
       })
       .filter(({x, y}) => !this.validateDrag || this.validateDrag({x, y}));
 
-    mouseDrag.subscribe(({x, y, currentDrag, clientX, clientY}) => {
-      this.setCssTransform(`translate(${x}px, ${y}px)`);
-      currentDrag.next({
-        clientX,
-        clientY,
-        dropData: this.dropData
-      });
-    });
-
-    Observable
-      .merge(
-        mouseDrag.take(1).map(value => [, value]),
-        mouseDrag.pairwise()
-      )
-      .filter(([previous, next]) => {
-        if (!previous) {
-          return true;
-        }
-        return previous.x !== next.x || previous.y !== next.y;
-      })
-      .map(([previous, next]) => next)
+    mouseDrag
       .filter(({x, y}) => x !== 0 || y !== 0)
-      .subscribe(({x, y}) => {
+      .subscribe(({x, y, currentDrag, clientX, clientY}) => {
+        this.setCssTransform(`translate(${x}px, ${y}px)`);
+        currentDrag.next({
+          clientX,
+          clientY,
+          dropData: this.dropData
+        });
         this.dragging.next({x, y});
       });
 

diff --git a/test/draggable.directive.spec.ts b/test/draggable.directive.spec.ts
@@ -205,7 +205,7 @@ describe('draggable directive', () => {
     expect(draggableElement.style.cursor).not.to.be.ok;
   });
 
-  it('should not call the dragging event multiple times with the same values', () => {
+  xit('should not call the dragging event multiple times with the same values', () => {
     fixture.componentInstance.dragSnapGrid = {y: 10, x: 10};
     fixture.detectChanges();
     const draggableElement: HTMLElement = fixture.componentInstance.draggable.element.nativeElement;