aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel/content.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-16 21:03:58 -0700
committerJose Antonio Marquez2012-03-16 21:03:58 -0700
commit415bab69cca4e8511144407b67bec80f2ba95422 (patch)
treec336ca8ae1bcd6761c924bacf8bfe7143b2c7885 /js/panels/presets/content.reel/content.html
parente7e18f02870a0cfe06e550acf8ffef6eab945231 (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-415bab69cca4e8511144407b67bec80f2ba95422.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r--js/panels/presets/content.reel/content.html12
1 files changed, 9 insertions, 3 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 38de2a6d..f01e6435 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -19,7 +19,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 "tabBar" : {"#": "tab-bar" }, 19 "tabBar" : {"#": "tab-bar" },
20 "tabs" : [ 20 "tabs" : [
21 {"key":"styles", "tab": {"#": "styles" }}, 21 {"key":"styles", "tab": {"#": "styles" }},
22 {"key":"transitions", "tab": {"#": "transitions" }} 22 {"key":"transitions", "tab": {"#": "transitions" }},
23 {"key":"animations", "tab": {"#": "animations" }}
23 ] 24 ]
24 } 25 }
25 }, 26 },
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30 "element": {"#": "librarySlot"}, 31 "element": {"#": "librarySlot"},
31 "switchComponents": { 32 "switchComponents": {
32 "styles": {"@": "stylesLibrary"}, 33 "styles": {"@": "stylesLibrary"},
33 "transitions": {"@": "transitionsLibrary"} 34 "transitions": {"@": "transitionsLibrary"},
34 35 "animations": {"@": "animationsLibrary"}
35 } 36 }
36 }, 37 },
37 "bindings": { 38 "bindings": {
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
49 "transitionsLibrary": { 50 "transitionsLibrary": {
50 "module": "js/panels/presets/transitions-presets.reel", 51 "module": "js/panels/presets/transitions-presets.reel",
51 "name": "TransitionsLibrary" 52 "name": "TransitionsLibrary"
53 },
54 "animationsLibrary": {
55 "module": "js/panels/presets/animations-presets.reel",
56 "name": "AnimationsLibrary"
52 } 57 }
53 58
54 } 59 }
@@ -59,6 +64,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
59 <nav id="tab-bar" class="tab-bar"> 64 <nav id="tab-bar" class="tab-bar">
60 <div id="styles">Style Library</div> 65 <div id="styles">Style Library</div>
61 <div id="transitions">Transitions Library</div> 66 <div id="transitions">Transitions Library</div>
67 <div id="animations">Animations Library</div>
62 </nav> 68 </nav>
63 <div id="librarySlot" class="librarySlot"></div> 69 <div id="librarySlot" class="librarySlot"></div>
64 </section> 70 </section>