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 --- 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 @@ -
-
+
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 --- js/panels/Timeline/Span.reel/Span.html | 5 +++++ js/panels/Timeline/Span.reel/Span.js | 6 ++++++ js/panels/Timeline/Span.reel/css/Span.css | 6 ++++++ 3 files changed, 17 insertions(+) (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 24b2bd10..f7e05982 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html @@ -1,4 +1,9 @@ + 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 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index f239454d..198d71f3 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + .tween_span{ position: absolute; height: 16px; -- cgit v1.2.3