From 5a74b74e8ec76d60cadf623cabaa0b667f1c4058 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 2 May 2012 11:08:59 -0700 Subject: code cleanup Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.js | 7 ------- js/panels/properties.reel/properties.js | 6 +----- js/stage/stage.reel/stage.js | 5 +++-- 3 files changed, 4 insertions(+), 14 deletions(-) (limited to 'js') 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, { handleResizeEnd: { value: function(e) { -// this.height -= this._resizedHeight; -// this.width -= this._resizedWidth; this.stage.resizeCanvases = true; this._resizedHeight = 0; this._resizedWidth = 0; @@ -187,11 +185,6 @@ exports.Ninja = Montage.create(Component, { } }, - willDraw: { - value: function() { - } - }, - draw: { value: function() { 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, { this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); } - if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { - this.threeD.flatten = false; - } else { - this.threeD.flatten = true; - } + this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; if(this.customPi !== stage.elementModel.pi) { // 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, { this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; } - }, - restoreScroll:{ + }, + + restoreScroll:{ value: function(){ this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; -- cgit v1.2.3