diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Timeline/Span.reel/Span.js | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.js')
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index f7bd4ff0..bfa6aab8 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
2 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
3 | 9 | ||
@@ -18,24 +24,19 @@ var Span = exports.Span = Montage.create(Component, { | |||
18 | }, | 24 | }, |
19 | set:function (value) { | 25 | set:function (value) { |
20 | this._spanWidth = value; | 26 | this._spanWidth = value; |
21 | } | 27 | this.needsDraw = true; |
22 | }, | ||
23 | |||
24 | prepareForDraw:{ | ||
25 | value:function(){ | ||
26 | |||
27 | } | 28 | } |
28 | }, | 29 | }, |
29 | 30 | ||
30 | draw:{ | 31 | draw:{ |
31 | value: function(){ | 32 | value: function(){ |
32 | this.tweenspan.style.width = this.spanWidth + "px"; | 33 | this.element.style.width = this.spanWidth + "px"; |
33 | } | 34 | } |
34 | }, | 35 | }, |
35 | 36 | ||
36 | highlightSpan:{ | 37 | highlightSpan:{ |
37 | value: function(){ | 38 | value: function(){ |
38 | this.tweenspan.classList.add("spanHighlight"); | 39 | this.element.classList.add("spanHighlight"); |
39 | } | 40 | } |
40 | } | 41 | } |
41 | }); | 42 | }); |