diff options
author | Ananya Sen | 2012-02-10 02:04:42 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-10 02:04:42 -0800 |
commit | cc3d8f5dfa82cf0a3620653af7e974f7417650f9 (patch) | |
tree | 4afe69f30f364f2011d706faced7243fb0eb6256 /js/panels/properties/sections/three-d-view.reel | |
parent | ad0ee69be3512325ede94738f23597086a141a3e (diff) | |
parent | fbe830fabe497d01f4f2eaddb867161a8187c101 (diff) | |
download | ninja-cc3d8f5dfa82cf0a3620653af7e974f7417650f9.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/properties/sections/three-d-view.reel')
-rwxr-xr-x | js/panels/properties/sections/three-d-view.reel/three-d-view.js | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js index 0c4a9171..35591afa 100755 --- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js | |||
@@ -207,29 +207,32 @@ exports.ThreeD = Montage.create(Component, { | |||
207 | templateDidLoad : { | 207 | templateDidLoad : { |
208 | value: function() { | 208 | value: function() { |
209 | Object.defineBinding(this, "axisMode", { | 209 | Object.defineBinding(this, "axisMode", { |
210 | boundObject: this.axisModeGroupControl, | 210 | boundObject: this.axisModeGroupControl, |
211 | boundObjectPropertyPath: "selectedIndex", | 211 | boundObjectPropertyPath: "selectedIndex", |
212 | oneway: false | 212 | oneway: false |
213 | }); | 213 | }); |
214 | |||
215 | this.eventManager.addEventListener("openDocument", this, false); | ||
216 | } | ||
217 | }, | ||
218 | |||
219 | handleOpenDocument: { | ||
220 | value: function() { | ||
214 | 221 | ||
215 | Object.defineBinding(this, "item", { | 222 | Object.defineBinding(this, "item", { |
216 | boundObject: this, | 223 | boundObject: this, |
217 | boundObjectPropertyPath: "application.ninja.selectedElements", | 224 | boundObjectPropertyPath: "application.ninja.selectedElements", |
218 | boundValueMutator: this._getSelectedItem, | 225 | boundValueMutator: this._getSelectedItem, |
219 | oneway: true | 226 | oneway: true |
220 | }); | 227 | }); |
221 | } | 228 | } |
222 | }, | 229 | }, |
223 | 230 | ||
224 | _getSelectedItem: { | 231 | _getSelectedItem: { |
225 | value: function(els) | 232 | value: function(els) { |
226 | { | 233 | if(els.length) { |
227 | if(els.length) | ||
228 | { | ||
229 | return els[0]._element || els[0]; | 234 | return els[0]._element || els[0]; |
230 | } | 235 | } else { |
231 | else | ||
232 | { | ||
233 | return this.boundObject.application.ninja.currentDocument.documentRoot; | 236 | return this.boundObject.application.ninja.currentDocument.documentRoot; |
234 | } | 237 | } |
235 | } | 238 | } |