diff options
| author | Jon Reid | 2012-02-08 10:29:00 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-08 10:29:00 -0800 |
| commit | 687ef6c8c8aad9728f106b1802cf0bfc5ce745f0 (patch) | |
| tree | db790c730001b9339f2a7083b522d33587de8efc /js/panels/Timeline/Span.reel/Span.js | |
| parent | 6ce7a6c94b2ea24a3a3a2aba7230864e924e952b (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-687ef6c8c8aad9728f106b1802cf0bfc5ce745f0.tar.gz | |
Merge branch 'Timeline-jduran' into Timeline-jreid
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.js')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 05f56a32..f7bd4ff0 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js | |||
| @@ -31,5 +31,11 @@ var Span = exports.Span = Montage.create(Component, { | |||
| 31 | value: function(){ | 31 | value: function(){ |
| 32 | this.tweenspan.style.width = this.spanWidth + "px"; | 32 | this.tweenspan.style.width = this.spanWidth + "px"; |
| 33 | } | 33 | } |
| 34 | }, | ||
| 35 | |||
| 36 | highlightSpan:{ | ||
| 37 | value: function(){ | ||
| 38 | this.tweenspan.classList.add("spanHighlight"); | ||
| 39 | } | ||
| 34 | } | 40 | } |
| 35 | }); | 41 | }); |