diff options
| author | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
| commit | 1144007ba899e87de73a372b45262f41f8e3e450 (patch) | |
| tree | db1e0789c5918076ebae180f48c06d33f2562d98 /js/panels/Timeline/Span.reel | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| parent | a8c153cc4f6a4f4f3367b0b2a763fa86b442c201 (diff) | |
| download | ninja-1144007ba899e87de73a372b45262f41f8e3e450.tar.gz | |
Merge pull request #64 from imix23ways/Timeline
Timeline
Diffstat (limited to 'js/panels/Timeline/Span.reel')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 6 | ||||
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 11 |
2 files changed, 5 insertions, 12 deletions
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 @@ | |||
| 9 | "module": "js/panels/Timeline/Span.reel", | 9 | "module": "js/panels/Timeline/Span.reel", |
| 10 | "name": "Span", | 10 | "name": "Span", |
| 11 | "properties": { | 11 | "properties": { |
| 12 | "element": {"#": "spanspace"}, | 12 | "element": {"#": "spanspace"} |
| 13 | "tweenspan": {"#": "tweenspan"} | ||
| 14 | } | 13 | } |
| 15 | } | 14 | } |
| 16 | 15 | ||
| @@ -19,8 +18,7 @@ | |||
| 19 | </head> | 18 | </head> |
| 20 | <body> | 19 | <body> |
| 21 | 20 | ||
| 22 | <div id="spanspace"> | 21 | <div id="spanspace" class="tween_span"> |
| 23 | <div id="tweenspan" class="tween_span"></div> | ||
| 24 | </div> | 22 | </div> |
| 25 | 23 | ||
| 26 | </body> | 24 | </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, { | |||
| 18 | }, | 18 | }, |
| 19 | set:function (value) { | 19 | set:function (value) { |
| 20 | this._spanWidth = value; | 20 | this._spanWidth = value; |
| 21 | } | 21 | this.needsDraw = true; |
| 22 | }, | ||
| 23 | |||
| 24 | prepareForDraw:{ | ||
| 25 | value:function(){ | ||
| 26 | |||
| 27 | } | 22 | } |
| 28 | }, | 23 | }, |
| 29 | 24 | ||
| 30 | draw:{ | 25 | draw:{ |
| 31 | value: function(){ | 26 | value: function(){ |
| 32 | this.tweenspan.style.width = this.spanWidth + "px"; | 27 | this.element.style.width = this.spanWidth + "px"; |
| 33 | } | 28 | } |
| 34 | }, | 29 | }, |
| 35 | 30 | ||
| 36 | highlightSpan:{ | 31 | highlightSpan:{ |
| 37 | value: function(){ | 32 | value: function(){ |
| 38 | this.tweenspan.classList.add("spanHighlight"); | 33 | this.element.classList.add("spanHighlight"); |
| 39 | } | 34 | } |
| 40 | } | 35 | } |
| 41 | }); | 36 | }); |