diff options
author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /js/panels/Resizer.js | |
parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/panels/Resizer.js')
-rw-r--r-- | js/panels/Resizer.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js index 69efd6ac..3afe5d5b 100644 --- a/js/panels/Resizer.js +++ b/js/panels/Resizer.js | |||
@@ -92,7 +92,7 @@ exports.Resizer = Montage.create(Component, { | |||
92 | 92 | ||
93 | handleDblclick: { | 93 | handleDblclick: { |
94 | value : function() { | 94 | value : function() { |
95 | this.panel.addEventListener("webkitTransitionEnd", this, true); | 95 | this.panel.addEventListener("webkitTransitionEnd", this, false); |
96 | if (this.isVertical) { | 96 | if (this.isVertical) { |
97 | this.panel.style.height = ""; | 97 | this.panel.style.height = ""; |
98 | } else { | 98 | } else { |
@@ -102,7 +102,7 @@ exports.Resizer = Montage.create(Component, { | |||
102 | } | 102 | } |
103 | }, | 103 | }, |
104 | 104 | ||
105 | captureWebkitTransitionEnd: { | 105 | handleWebkitTransitionEnd: { |
106 | value: function() { | 106 | value: function() { |
107 | if(this.redrawStage) { | 107 | if(this.redrawStage) { |
108 | this.application.ninja.stage.resizeCanvases = true; | 108 | this.application.ninja.stage.resizeCanvases = true; |