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.html |  6 ++----
 js/panels/Timeline/Span.reel/Span.js   | 11 +++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

(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
index e36a25d6..24b2bd10 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -9,8 +9,7 @@
                             "module": "js/panels/Timeline/Span.reel",
                             "name": "Span",
                             "properties": {
-                                "element": {"#": "spanspace"},
-                                "tweenspan": {"#": "tweenspan"}
+                                "element": {"#": "spanspace"}
                             }
                         }
 
@@ -19,8 +18,7 @@
 	</head>
 	<body>
 
-    	<div id="spanspace">
-            <div id="tweenspan" class="tween_span"></div>
+    	<div id="spanspace" class="tween_span">
     	</div>
 
     </body>
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