diff options
author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/panels/resize-composer.js | |
parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/resize-composer.js')
-rw-r--r-- | js/panels/resize-composer.js | 5 |
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 | } |