aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-24 13:50:46 -0700
committerNivesh Rajbhandari2012-03-24 13:50:46 -0700
commitbda9f8f5829c943486f8850e68c991e83f8fb8c8 (patch)
tree0c524074cb8f1acb3bff38923e527fb267d9074c /js/controllers
parent1b7e627ae290dacec3a242445f3e6c5de302626a (diff)
downloadninja-bda9f8f5829c943486f8850e68c991e83f8fb8c8.tar.gz
Adding logic for flatten checkbox in PI.
This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/component-controller.js2
-rwxr-xr-xjs/controllers/elements/stage-controller.js5
2 files changed, 7 insertions, 0 deletions
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js
index 83450d0f..fbe9a995 100755
--- a/js/controllers/elements/component-controller.js
+++ b/js/controllers/elements/component-controller.js
@@ -14,6 +14,7 @@ exports.ComponentController = Montage.create(ElementController, {
14 switch(prop) { 14 switch(prop) {
15 case "id": 15 case "id":
16 case "class": 16 case "class":
17 case "-webkit-transform-style":
17 case "left": 18 case "left":
18 case "top": 19 case "top":
19 case "width": 20 case "width":
@@ -34,6 +35,7 @@ exports.ComponentController = Montage.create(ElementController, {
34 switch(p) { 35 switch(p) {
35 case "id": 36 case "id":
36 case "class": 37 case "class":
38 case "-webkit-transform-style":
37 case "left": 39 case "left":
38 case "top": 40 case "top":
39 case "width": 41 case "width":
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 2734e226..f2c8fa2d 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -83,6 +83,8 @@ exports.StageController = Montage.create(ElementController, {
83 return el.elementModel.stageDimension.style.getProperty(p); 83 return el.elementModel.stageDimension.style.getProperty(p);
84 case "width": 84 case "width":
85 return el.elementModel.stageDimension.style.getProperty(p); 85 return el.elementModel.stageDimension.style.getProperty(p);
86 case "-webkit-transform-style":
87 return el.elementModel.stageView.style.getProperty(p);
86 default: 88 default:
87 return ElementController.getProperty(el, p, false, true); 89 return ElementController.getProperty(el, p, false, true);
88 //console.log("Undefined Stage property ", p); 90 //console.log("Undefined Stage property ", p);
@@ -111,6 +113,9 @@ exports.StageController = Montage.create(ElementController, {
111 this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400; 113 this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400;
112 el.elementModel.stageDimension.style.setProperty(p, value); 114 el.elementModel.stageDimension.style.setProperty(p, value);
113 break; 115 break;
116 case "-webkit-transform-style":
117 el.elementModel.stageView.style.setProperty(p, value);
118 break;
114 default: 119 default:
115 console.log("Undefined property ", p, "for the Stage Controller"); 120 console.log("Undefined property ", p, "for the Stage Controller");
116 } 121 }