diff options
author | Eric Guzman | 2012-05-17 17:09:27 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:09:27 -0700 |
commit | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (patch) | |
tree | 2742812a1437f3c7f6a9151e2a786299bb538922 /js/panels/presets/transitions-presets.reel | |
parent | 4e43fe2c97833c0847a53484c9589697e64137dc (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-82954f400f7f8609aef0d2bc1f44c9d960907be6.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/transitions-presets.reel')
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 5 |
1 files changed, 2 insertions, 3 deletions
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", |