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/Span.reel/Span.html | 27 ++++++++++++++++++++++++ js/panels/Timeline/Span.reel/Span.js | 35 +++++++++++++++++++++++++++++++ js/panels/Timeline/Span.reel/css/Span.css | 6 ++++++ 3 files changed, 68 insertions(+) create mode 100644 js/panels/Timeline/Span.reel/Span.html create mode 100644 js/panels/Timeline/Span.reel/Span.js create mode 100644 js/panels/Timeline/Span.reel/css/Span.css (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html new file mode 100644 index 00000000..e36a25d6 --- /dev/null +++ b/js/panels/Timeline/Span.reel/Span.html @@ -0,0 +1,27 @@ + + + + + + + + + +

+ + + \ No newline at end of file diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js new file mode 100644 index 00000000..05f56a32 --- /dev/null +++ b/js/panels/Timeline/Span.reel/Span.js @@ -0,0 +1,35 @@ +var Montage = require("montage/core/core").Montage; +var Component = require("montage/ui/component").Component; + +var Span = exports.Span = Montage.create(Component, { + + hasTemplate:{ + value: true + }, + + _spanWidth:{ + value:0 + }, + + spanWidth:{ + serializable:true, + get:function () { + return this._spanWidth; + }, + set:function (value) { + this._spanWidth = value; + } + }, + + prepareForDraw:{ + value:function(){ + + } + }, + + draw:{ + value: function(){ + this.tweenspan.style.width = this.spanWidth + "px"; + } + } +}); diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css new file mode 100644 index 00000000..1583c20f --- /dev/null +++ b/js/panels/Timeline/Span.reel/css/Span.css @@ -0,0 +1,6 @@ +.tween_span{ + position: absolute; + height: 16px; + opacity: 0.3; + background-color: white; +} \ No newline at end of file -- cgit v1.2.3 From 8cb53b7ec3b4f34fd77945256ad80bc1ae54b887 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 7 Feb 2012 21:28:14 -0800 Subject: Add Span color highlight for animated spans and restyle keyframes Signed-off-by: Jonathan Duran --- js/panels/Timeline/Span.reel/Span.js | 6 ++++++ js/panels/Timeline/Span.reel/css/Span.css | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 05f56a32..f7bd4ff0 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js @@ -31,5 +31,11 @@ var Span = exports.Span = Montage.create(Component, { value: function(){ this.tweenspan.style.width = this.spanWidth + "px"; } + }, + + highlightSpan:{ + value: function(){ + this.tweenspan.classList.add("spanHighlight"); + } } }); diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index 1583c20f..1e988c6c 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css @@ -3,4 +3,8 @@ height: 16px; opacity: 0.3; background-color: white; +} + +.tween_span.spanHighlight{ + background-color: #a0c8ff; } \ No newline at end of file -- cgit v1.2.3 From 479cd367696ae5bf02c774e2be75234aad05bce7 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 8 Feb 2012 10:36:45 -0800 Subject: Keyframe and span style updates and change time marker times Signed-off-by: Jonathan Duran --- js/panels/Timeline/Span.reel/css/Span.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline/Span.reel') diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index 1e988c6c..f239454d 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css @@ -1,10 +1,11 @@ .tween_span{ position: absolute; height: 16px; - opacity: 0.3; + opacity: 0.15; background-color: white; } .tween_span.spanHighlight{ background-color: #a0c8ff; + opacity: 0.4; } \ No newline at end of file -- cgit v1.2.3