diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 7 | ||||
-rwxr-xr-x | js/panels/properties.reel/properties.js | 6 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 5 |
3 files changed, 4 insertions, 14 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) { |
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index ee90cd64..8c2daa14 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -208,11 +208,7 @@ exports.Properties = Montage.create(Component, { | |||
208 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | 208 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); |
209 | } | 209 | } |
210 | 210 | ||
211 | if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { | 211 | this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; |
212 | this.threeD.flatten = false; | ||
213 | } else { | ||
214 | this.threeD.flatten = true; | ||
215 | } | ||
216 | 212 | ||
217 | if(this.customPi !== stage.elementModel.pi) { | 213 | if(this.customPi !== stage.elementModel.pi) { |
218 | // We need to unregister color chips from the previous selection from the Color Model | 214 | // We need to unregister color chips from the previous selection from the Color Model |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 515165bf..a7c22a7f 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -958,8 +958,9 @@ exports.Stage = Montage.create(Component, { | |||
958 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; | 958 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; |
959 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; | 959 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; |
960 | } | 960 | } |
961 | }, | 961 | }, |
962 | restoreScroll:{ | 962 | |
963 | restoreScroll:{ | ||
963 | value: function(){ | 964 | value: function(){ |
964 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 965 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |
965 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 966 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |