aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/transitions-presets.reel/transitions-presets.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-14 11:45:11 -0700
committerArmen Kesablyan2012-05-14 11:45:11 -0700
commit9e6c0a247bd2f14d92278bcd97fff40277b71667 (patch)
tree4194388c03814b9168922dbf2907edf426295874 /js/panels/presets/transitions-presets.reel/transitions-presets.html
parent9fc3b70bf57e10846e71808c6041fbc339a435d1 (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-9e6c0a247bd2f14d92278bcd97fff40277b71667.tar.gz
Merge branch 'refs/heads/masterDomArc' into binding
Diffstat (limited to 'js/panels/presets/transitions-presets.reel/transitions-presets.html')
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html5
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",