fix: cancel mousedrag event when either a mouseup or mousedown event …

…fires
mattlewis92 · Jun 26, 2016 · c76be59 · c76be59
1 parent 1af705a
commit c76be59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/demo/demo.ts b/demo/demo.ts
@@ -34,6 +34,7 @@ import {Resizable, ResizeEvent, ResizeHandle} from './../angular2-resizable';
         [ngStyle]="style"
         mwl-resizable
         [validateResize]="validate"
+        [resizeEdges]="{bottom: true, right: true, top: true, left: true}"
         (onResizeEnd)="onResizeEnd($event)">
         <img
           src="http://i.imgur.com/eqzz2dl.gif"

diff --git a/src/resizable.directive.ts b/src/resizable.directive.ts
@@ -13,6 +13,7 @@ import {
 } from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 import {Observable} from 'rxjs/Observable';
+import {merge} from 'rxjs/observable/merge';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/operator/takeUntil';
@@ -193,7 +194,7 @@ export class Resizable implements OnInit, AfterViewInit {
           mouseX: moveCoords.mouseX - startCoords.mouseX,
           mouseY: moveCoords.mouseY - startCoords.mouseY
         };
-      }).takeUntil(this.mouseup);
+      }).takeUntil(merge(this.mouseup, this.mousedown));
     }).filter(() => !!currentResize);
 
     mousedrag.map(({mouseX, mouseY}) => {

diff --git a/webpack.config.dist.js b/webpack.config.dist.js
@@ -30,6 +30,12 @@ module.exports = {
       commonjs2: 'rxjs/Observable',
       amd: 'rxjs/Observable'
     },
+    'rxjs/observable/merge': {
+      root: ['rx', 'Observable', 'merge'],
+      commonjs: 'rxjs/observable/merge',
+      commonjs2: 'rxjs/observable/merge',
+      amd: 'rxjs/observable/merge'
+    },
     'rxjs/add/operator/map': {
       root: ['rx', 'Observable'],
       commonjs: 'rxjs/operator/map',