diff options
| author | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
| commit | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (patch) | |
| tree | e473e99d0e9ad8e9ca44cc6e2c2e86d2e8ff7477 /js/panels | |
| parent | 67a9691aba370cf4e9928ac6cf14548ded95fc92 (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-6fcaa4e923a19672b5860b4c6f67d836680e7e99.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
4 files changed, 6 insertions, 8 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 7fc48a55..b5d7a869 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | "prototype": "js/panels/Materials/materials-popup.reel" | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
| 51 | }, | 51 | }, |
| 52 | "materialsController" : { | 52 | "materialsController" : { |
| 53 | "prototype": "js/controllers/tree-controller", | 53 | "prototype": "js/components/controllers/tree-controller", |
| 54 | "properties" : { | 54 | "properties" : { |
| 55 | "branchKey" : "children", | 55 | "branchKey" : "children", |
| 56 | "labelKey" : "label", | 56 | "labelKey" : "label", |
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index 347e5497..2b5a33d6 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.html | |||
| @@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]", | 14 | "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]", |
| 15 | "properties" : { | 15 | "properties" : { |
| 16 | "element" : {"#" : "animationsLibrary"}, | 16 | "element" : {"#" : "animationsLibrary"} |
| 17 | "treeList" : {"@" : "treeList"} | ||
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | "presetsController" : { | 19 | "presetsController" : { |
| 21 | "prototype": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
| 22 | "properties" : { | 21 | "properties" : { |
| 23 | "branchKey" : "children", | 22 | "branchKey" : "children", |
| 24 | "labelKey" : "text", | 23 | "labelKey" : "text", |
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html index a3d718bb..bebff22d 100644 --- a/js/panels/presets/style-presets.reel/style-presets.html +++ b/js/panels/presets/style-presets.reel/style-presets.html | |||
| @@ -17,7 +17,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 17 | } | 17 | } |
| 18 | }, | 18 | }, |
| 19 | "presetsController" : { | 19 | "presetsController" : { |
| 20 | "prototype": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
| 21 | "properties" : { | 21 | "properties" : { |
| 22 | "branchKey" : "children", | 22 | "branchKey" : "children", |
| 23 | "labelKey" : "text", | 23 | "labelKey" : "text", |
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html index a6b98aeb..add43ee7 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.html +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html | |||
| @@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]", | 14 | "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]", |
| 15 | "properties" : { | 15 | "properties" : { |
| 16 | "element" : {"#" : "transitionsLibrary"}, | 16 | "element" : {"#" : "transitionsLibrary"} |
| 17 | "treeList" : {"@" : "treeList"} | ||
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | "presetsController" : { | 19 | "presetsController" : { |
| 21 | "prototype": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
| 22 | "properties" : { | 21 | "properties" : { |
| 23 | "branchKey" : "children", | 22 | "branchKey" : "children", |
| 24 | "labelKey" : "text", | 23 | "labelKey" : "text", |