aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.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/panels/properties.reel/properties.js
parent9c0bda09a502472768f6dd5090a882d11be58d23 (diff)
parent30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff)
downloadninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-xjs/panels/properties.reel/properties.js6
1 files changed, 1 insertions, 5 deletions
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