diff options
author | Valerio Virgillito | 2012-06-11 14:10:08 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 14:10:08 -0700 |
commit | f4ad120c1a0d8594b8741eb1b07fdbd4fefcadeb (patch) | |
tree | 5dff803d67722595418e69f6cce9ec8a1a616f2f /js/panels | |
parent | 30f17ae934ee60ed6e4ce52fad1eebc35fc5914a (diff) | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
download | ninja-f4ad120c1a0d8594b8741eb1b07fdbd4fefcadeb.tar.gz |
Merge branch 'refs/heads/master' into dom-container
Diffstat (limited to 'js/panels')
-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 | } |