diff options
author | Jon Reid | 2012-06-12 13:32:02 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/panels/resize-composer.js | |
parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | } |