diff options
author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/ninja.reel/ninja.js | |
parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index d2d45410..cf7c6cf4 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -104,8 +104,6 @@ exports.Ninja = Montage.create(Component, { | |||
104 | 104 | ||
105 | handleResizeEnd: { | 105 | handleResizeEnd: { |
106 | value: function(e) { | 106 | value: function(e) { |
107 | // this.height -= this._resizedHeight; | ||
108 | // this.width -= this._resizedWidth; | ||
109 | this.stage.resizeCanvases = true; | 107 | this.stage.resizeCanvases = true; |
110 | this._resizedHeight = 0; | 108 | this._resizedHeight = 0; |
111 | this._resizedWidth = 0; | 109 | this._resizedWidth = 0; |
@@ -187,11 +185,6 @@ exports.Ninja = Montage.create(Component, { | |||
187 | } | 185 | } |
188 | }, | 186 | }, |
189 | 187 | ||
190 | willDraw: { | ||
191 | value: function() { | ||
192 | } | ||
193 | }, | ||
194 | |||
195 | draw: { | 188 | draw: { |
196 | value: function() { | 189 | value: function() { |
197 | if(this.isResizing) { | 190 | if(this.isResizing) { |