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 | |
| 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')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 11 | ||||
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 17 | ||||
| -rw-r--r-- | js/panels/Timeline/Span.reel/css/Span.css | 6 |
3 files changed, 22 insertions, 12 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index e36a25d6..f7e05982 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 2 | <html lang="en"> | 7 | <html lang="en"> |
| 3 | <head> | 8 | <head> |
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| @@ -9,8 +14,7 @@ | |||
| 9 | "module": "js/panels/Timeline/Span.reel", | 14 | "module": "js/panels/Timeline/Span.reel", |
| 10 | "name": "Span", | 15 | "name": "Span", |
| 11 | "properties": { | 16 | "properties": { |
| 12 | "element": {"#": "spanspace"}, | 17 | "element": {"#": "spanspace"} |
| 13 | "tweenspan": {"#": "tweenspan"} | ||
| 14 | } | 18 | } |
| 15 | } | 19 | } |
| 16 | 20 | ||
| @@ -19,8 +23,7 @@ | |||
| 19 | </head> | 23 | </head> |
| 20 | <body> | 24 | <body> |
| 21 | 25 | ||
| 22 | <div id="spanspace"> | 26 | <div id="spanspace" class="tween_span"> |
| 23 | <div id="tweenspan" class="tween_span"></div> | ||
| 24 | </div> | 27 | </div> |
| 25 | 28 | ||
| 26 | </body> | 29 | </body> |
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 | }); |
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 @@ | |||
| 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 | .tween_span{ | 7 | .tween_span{ |
| 2 | position: absolute; | 8 | position: absolute; |
| 3 | height: 16px; | 9 | height: 16px; |