aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-30 14:51:33 -0700
committerValerio Virgillito2012-05-30 14:51:33 -0700
commit817a80d9415b2fc7fde04e779e44292f8d3deb97 (patch)
treebdce2dddc901d34aef1b9d60c2ce0afff432c0e0 /js/panels
parent501221d0bbf776ce71bc7ae0f482c931f6651659 (diff)
parent435a36425a411c7b9a711670c74abcd04551750d (diff)
downloadninja-817a80d9415b2fc7fde04e779e44292f8d3deb97.tar.gz
Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into document-bindings-fix
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/properties.reel/properties.html5
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js4
2 files changed, 8 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index ac0dab5a..b9aa206b 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -56,7 +56,10 @@
56 } 56 }
57 }, 57 },
58 "threeDProperties": { 58 "threeDProperties": {
59 "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]" 59 "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
60 "bindings": {
61 "currentDocument": {"<-": "@owner.currentDocument"}
62 }
60 }, 63 },
61 64
62 "CustomSections": { 65 "CustomSections": {
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 0320c327..49907c9d 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
@@ -198,6 +198,10 @@ exports.ThreeD = Montage.create(Component, {
198 } 198 }
199 }, 199 },
200 200
201 _currentDocument: {
202 value : null
203 },
204
201 currentDocument : { 205 currentDocument : {
202 get : function() { 206 get : function() {
203 return this._currentDocument; 207 return this._currentDocument;