aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/sections
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 00:22:43 -0800
committerEric Guzman2012-02-16 00:22:43 -0800
commit82b1a273219f0ae3d119e156c7acccdbe478f441 (patch)
tree74c45e5e3afc6706b2f7a7918807f72c54cdcfc5 /js/panels/properties/sections
parentaf20ca9b11133dd5cefb9275dbe8fb101c3380d0 (diff)
parent966f0adaf1d4b7f2dd5a6e31643df58bff713884 (diff)
downloadninja-82b1a273219f0ae3d119e156c7acccdbe478f441.tar.gz
Merge branch 'refs/heads/TreeComponents' into PresetsPanel
Diffstat (limited to 'js/panels/properties/sections')
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/color-select.reel/color-select.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/color-select.reel/color-select.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/single-row.reel/single-row.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom-rows/single-row.reel/single-row.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom.reel/custom.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/custom.reel/custom.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.css0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/position-and-size.reel/position-and-size.js0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/three-d-view.reel/three-d-view.html0
-rwxr-xr-x[-rw-r--r--]js/panels/properties/sections/three-d-view.reel/three-d-view.js35
13 files changed, 19 insertions, 16 deletions
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
index 9c2588b9..9c2588b9 100644..100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
index 60f8efef..60f8efef 100644..100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
diff --git a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
index 0398ff4c..0398ff4c 100644..100755
--- a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
diff --git a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
index 72d216ca..72d216ca 100644..100755
--- a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
+++ b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
diff --git a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
index 27c02380..27c02380 100644..100755
--- a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
+++ b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
diff --git a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
index b606d6b8..b606d6b8 100644..100755
--- a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
+++ b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
diff --git a/js/panels/properties/sections/custom.reel/custom.html b/js/panels/properties/sections/custom.reel/custom.html
index 6d4cf0cd..6d4cf0cd 100644..100755
--- a/js/panels/properties/sections/custom.reel/custom.html
+++ b/js/panels/properties/sections/custom.reel/custom.html
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js
index a2b9b9fa..a2b9b9fa 100644..100755
--- a/js/panels/properties/sections/custom.reel/custom.js
+++ b/js/panels/properties/sections/custom.reel/custom.js
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.css b/js/panels/properties/sections/position-and-size.reel/position-and-size.css
index 227a232b..227a232b 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.css
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.css
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.html b/js/panels/properties/sections/position-and-size.reel/position-and-size.html
index 79a55385..79a55385 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.html
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.html
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.js b/js/panels/properties/sections/position-and-size.reel/position-and-size.js
index 49117090..49117090 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.js
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.js
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
index 1e24cb55..1e24cb55 100644..100755
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
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 100644..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 }