aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-07 10:38:04 -0700
committerJose Antonio Marquez2012-05-07 10:38:04 -0700
commit5293ede5f3493900df93da33197416d853f8d907 (patch)
tree3155deaea5616fa09fc96c84567419fec5f288a2 /js/ninja.reel/ninja.js
parent9c0bda09a502472768f6dd5090a882d11be58d23 (diff)
parent30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff)
downloadninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js9
1 files changed, 1 insertions, 8 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index d2d45410..edc1efa4 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) {
@@ -307,7 +300,7 @@ exports.Ninja = Montage.create(Component, {
307 // Turn on WebGL animation during preview 300 // Turn on WebGL animation during preview
308 _toggleWebGlAnimation: { 301 _toggleWebGlAnimation: {
309 value: function(inLivePreview) { 302 value: function(inLivePreview) {
310 var glCanvases = this.currentDocument.iframe.contentWindow.document.querySelectorAll('[data-RDGE-id]'), 303 var glCanvases = this.currentDocument.model.views.design.iframe.contentWindow.document.querySelectorAll('[data-RDGE-id]'),
311 glShapeModel; 304 glShapeModel;
312 if(glCanvases) { 305 if(glCanvases) {
313 for(var i = 0, len = glCanvases.length; i<len; i++) { 306 for(var i = 0, len = glCanvases.length; i<len; i++) {