Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 41 insertions, 0 deletions

diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
new file mode 100644
index 00000000..f7bd4ff0
--- /dev/null
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -0,0 +1,41 @@
+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";
+        }
+    },
+
+    highlightSpan:{
+        value: function(){
+            this.tweenspan.classList.add("spanHighlight");
+        }
+    }
+});