From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 13:30:49 -0800 Subject: merge new timeline Signed-off-by: Jonathan Duran --- js/panels/Timeline/Style.reel/Style.html | 91 ++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 js/panels/Timeline/Style.reel/Style.html (limited to 'js/panels/Timeline/Style.reel/Style.html') diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html new file mode 100644 index 00000000..f10ad842 --- /dev/null +++ b/js/panels/Timeline/Style.reel/Style.html @@ -0,0 +1,91 @@ + + + + + + + + +
+
+ + + +
+
+ + \ No newline at end of file -- cgit v1.2.3 From b4dd3e269b9de188e015f4cfac29c70a684f4c4f Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 18:25:15 -0800 Subject: Fix problem with resizer set to capture all webkitTransitionEnd events. Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran --- js/panels/Timeline/Style.reel/Style.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/Style.reel/Style.html') diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index f10ad842..c6f29626 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html @@ -33,7 +33,7 @@ } }, "hottextunit" : { - "module" : "montage/ui/hottextunit.reel", + "module" : "js/components/hottextunit.reel", "name" : "HotTextUnit", "properties" : { "element" : {"#":"value-editor-hottext"} -- cgit v1.2.3