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 <jduran@motorola.com>
---
 js/panels/Timeline/Span.reel/Span.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 js/panels/Timeline/Span.reel/Span.js

(limited to 'js/panels/Timeline/Span.reel/Span.js')

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";
+        }
+    }
+});
-- 
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 <jduran@motorola.com>
---
 js/panels/Timeline/Span.reel/Span.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/panels/Timeline/Span.reel/Span.js')

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");
+        }
     }
 });
-- 
cgit v1.2.3