From 163ffbf531872a81c4d4be4321b065c22cf0715b Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 16 Mar 2012 17:09:08 -0700
Subject: Presets Panel - Adding Animations Tab
---
js/panels/presets/content.reel/content.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'js/panels/presets/content.reel')
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
"tabBar" : {"#": "tab-bar" },
"tabs" : [
{"key":"styles", "tab": {"#": "styles" }},
- {"key":"transitions", "tab": {"#": "transitions" }}
+ {"key":"transitions", "tab": {"#": "transitions" }},
+ {"key":"animations", "tab": {"#": "animations" }}
]
}
},
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"element": {"#": "librarySlot"},
"switchComponents": {
"styles": {"@": "stylesLibrary"},
- "transitions": {"@": "transitionsLibrary"}
-
+ "transitions": {"@": "transitionsLibrary"},
+ "animations": {"@": "animationsLibrary"}
}
},
"bindings": {
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
"transitionsLibrary": {
"module": "js/panels/presets/transitions-presets.reel",
"name": "TransitionsLibrary"
+ },
+ "animationsLibrary": {
+ "module": "js/panels/presets/animations-presets.reel",
+ "name": "AnimationsLibrary"
}
}
@@ -59,6 +64,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
--
cgit v1.2.3
From a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 16 Mar 2012 17:56:25 -0700
Subject: Presets Panel - Change Tab labels, Add Un-3d preset
---
js/panels/presets/content.reel/content.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/panels/presets/content.reel')
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index f01e6435..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -62,9 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
--
cgit v1.2.3