aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-08 14:27:54 -0700
committerValerio Virgillito2012-06-08 14:27:54 -0700
commitfd3cde46dbdf28b5e1166773fe5e092e2bd865b6 (patch)
tree5cba25a9729cb21b0c03912dc93c9198e378f832 /js/panels
parent95755a7fb204f41a08b32c0a94a93a2d69b8488d (diff)
parent0e18d3d973da09d636e848820e30d22a5e554fc9 (diff)
downloadninja-fd3cde46dbdf28b5e1166773fe5e092e2bd865b6.tar.gz
Merge pull request #284 from mencio/timeline-resizer-fix
IKNINJA-1702: Fix the timeline resized throwing a debugger error
Diffstat (limited to 'js/panels')
-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 }