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


From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:37:17 -0800
Subject: Timeline Reset to clean Master branch.  Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Span.reel/Span.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(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 f7bd4ff0..8114e74a 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -18,24 +18,19 @@ var Span = exports.Span = Montage.create(Component, {
         },
         set:function (value) {
             this._spanWidth = value;
-        }
-    },
-
-    prepareForDraw:{
-        value:function(){
-
+            this.needsDraw = true;
         }
     },
 
     draw:{
         value: function(){
-            this.tweenspan.style.width = this.spanWidth + "px";
+            this.element.style.width = this.spanWidth + "px";
         }
     },
 
     highlightSpan:{
         value: function(){
-            this.tweenspan.classList.add("spanHighlight");
+            this.element.classList.add("spanHighlight");
         }
     }
 });
-- 
cgit v1.2.3


From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 10:20:04 -0800
Subject: Adding some missing copyrights

Signed-off-by: Valerio Virgillito <valerio@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 8114e74a..bfa6aab8 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -1,3 +1,9 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-- 
cgit v1.2.3