diff options
author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |
parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js')
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index f72d1ff6..dcba51a4 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |||
@@ -79,6 +79,10 @@ exports.ThreeD = Montage.create(Component, { | |||
79 | value: 0 | 79 | value: 0 |
80 | }, | 80 | }, |
81 | 81 | ||
82 | flatten: { | ||
83 | value: false | ||
84 | }, | ||
85 | |||
82 | _disableTranslation: { | 86 | _disableTranslation: { |
83 | value: true | 87 | value: true |
84 | }, | 88 | }, |
@@ -107,6 +111,16 @@ exports.ThreeD = Montage.create(Component, { | |||
107 | value: null | 111 | value: null |
108 | }, | 112 | }, |
109 | 113 | ||
114 | handleAction: { | ||
115 | value: function(event) { | ||
116 | if(event.currentTarget.identifier === "flatten") { | ||
117 | this.application.ninja.elementMediator.setProperty([this.item], | ||
118 | "-webkit-transform-style", | ||
119 | event.currentTarget.checked ? ["flat"] : ["preserve-3d"]); | ||
120 | } | ||
121 | } | ||
122 | }, | ||
123 | |||
110 | handleChange: { | 124 | handleChange: { |
111 | value: function(event) { | 125 | value: function(event) { |
112 | if(event.wasSetByCode) { | 126 | if(event.wasSetByCode) { |