aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels/presets
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html9
-rw-r--r--js/panels/presets/content.reel/content.html12
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html9
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html9
4 files changed, 18 insertions, 21 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index d333cf97..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",
@@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 47 </script>
49</head> 48</head>
50<body> 49<body>
51<section id="animationsLibrary" class="animationsLibrary"> 50<section data-montage-id="animationsLibrary" class="animationsLibrary">
52 <div id="libraryContainer"></div> 51 <div data-montage-id="libraryContainer"></div>
53</section> 52</section>
54</body> 53</body>
55</html> \ No newline at end of file 54</html> \ No newline at end of file
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 27928670..50a48389 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
55 </script> 55 </script>
56</head> 56</head>
57<body> 57<body>
58 <section id="presetsPanel" class="presetsPanel"> 58 <section data-montage-id="presetsPanel" class="presetsPanel">
59 <nav id="tab-bar" class="tab-bar"> 59 <nav data-montage-id="tab-bar" class="tab-bar">
60 <div id="styles">Styles</div> 60 <div data-montage-id="styles">Styles</div>
61 <div id="transitions">Transitions</div> 61 <div data-montage-id="transitions">Transitions</div>
62 <div id="animations">Animations</div> 62 <div data-montage-id="animations">Animations</div>
63 </nav> 63 </nav>
64 <div id="librarySlot" class="librarySlot"></div> 64 <div data-montage-id="librarySlot" class="librarySlot"></div>
65 </section> 65 </section>
66</body> 66</body>
67</html> \ No newline at end of file 67</html> \ No newline at end of file
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 7490a73b..bebff22d 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-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/style-presets.reel[StylesLibrary]", 14 "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]",
15 "properties" : { 15 "properties" : {
16 "element" : {"#" : "stylesLibrary"}, 16 "element" : {"#" : "stylesLibrary"}
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",
@@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 47 </script>
49</head> 48</head>
50<body> 49<body>
51<section id="stylesLibrary" class="stylesLibrary"> 50<section data-montage-id="stylesLibrary" class="stylesLibrary">
52 <div id="libraryContainer"></div> 51 <div data-montage-id="libraryContainer"></div>
53</section> 52</section>
54</body> 53</body>
55</html> \ No newline at end of file 54</html> \ No newline at end of file
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index 2f084463..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",
@@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 47 </script>
49</head> 48</head>
50<body> 49<body>
51<section id="transitionsLibrary" class="transitionsLibrary"> 50<section data-montage-id="transitionsLibrary" class="transitionsLibrary">
52 <div id="libraryContainer"></div> 51 <div data-montage-id="libraryContainer"></div>
53</section> 52</section>
54</body> 53</body>
55</html> \ No newline at end of file 54</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 09:10:52 +0000