Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/preloader/Preloader.js

1 files changed, 3 insertions, 8 deletions

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");
         }
     }
 });