aboutsummaryrefslogtreecommitdiff
path: root/js/panels/resize-composer.js
diff options
context:
space:
mode:
authorEric Guzman2012-06-11 13:28:42 -0700
committerEric Guzman2012-06-11 13:28:42 -0700
commit3a4727ffc350216a434a7c6977b6a23653b77780 (patch)
treec5dff306f8803c36a16163ba5df1e7f492e762b5 /js/panels/resize-composer.js
parentd6b46ba496c9c8974ae39bb476aea35bcd1ddaf1 (diff)
parent337efc667372326ae2f9984d89a47bb151016774 (diff)
downloadninja-3a4727ffc350216a434a7c6977b6a23653b77780.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/panels/resize-composer.js')
-rw-r--r--js/panels/resize-composer.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..2278623f 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -105,6 +105,8 @@ exports.ResizeComposer = Montage.create(Composer, {
105 captureMouseup: { 105 captureMouseup: {
106 value: function(e) { 106 value: function(e) {
107 e.preventDefault(); 107 e.preventDefault();
108 e.stopImmediatePropagation();
109 e.stopPropagation();
108 window.removeEventListener("mousemove", this, true); 110 window.removeEventListener("mousemove", this, true);
109 window.removeEventListener("mouseup", this, true); 111 window.removeEventListener("mouseup", this, true);
110 this._executeEvent("resizeEnd"); 112 this._executeEvent("resizeEnd");
@@ -113,6 +115,9 @@ exports.ResizeComposer = Montage.create(Composer, {
113 115
114 captureMousemove: { 116 captureMousemove: {
115 value: function(e) { 117 value: function(e) {
118 e.preventDefault();
119 e.stopImmediatePropagation();
120 e.stopPropagation();
116 if (this.xAxis) { 121 if (this.xAxis) {
117 this._deltaX = e.clientX - this._startX; 122 this._deltaX = e.clientX - this._startX;
118 } 123 }