diff options
| author | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
| commit | 11cfa9ef2871002b600f1c18f4e06e55a826163c (patch) | |
| tree | 381b23b0fa86cdf283a0da7a1b7d532a94e89db4 /js/panels/presets | |
| parent | 4cb3612c9a67f4020d2949b5e5e5d84a90017974 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-11cfa9ef2871002b600f1c18f4e06e55a826163c.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/presets')
3 files changed, 5 insertions, 7 deletions
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", |