diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/Span.reel | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Span.reel')
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 53 | ||||
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 293 | ||||
-rw-r--r-- | js/panels/Timeline/Span.reel/css/Span.css | 23 | ||||
-rw-r--r-- | js/panels/Timeline/Span.reel/scss/Span.scss | 33 |
4 files changed, 203 insertions, 199 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index d328fcdb..ad3ac8b2 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,9 +30,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="css/Span.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/Span.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "owner": { | 38 | "owner": { |
@@ -45,17 +46,17 @@ POSSIBILITY OF SUCH DAMAGE. | |||
45 | 46 | ||
46 | } | 47 | } |
47 | </script> | 48 | </script> |
48 | </head> | 49 | </head> |
49 | <body> | 50 | <body> |
50 | 51 | ||
51 | <div data-montage-id="spanspace" class="tween_span"> | 52 | <div data-montage-id="spanspace" class="tween_span"> |
52 | <div class="tween_span_bar"></div> | 53 | <div class="tween_span_bar"></div> |
53 | <div data-montage-id="container_easing" class="container-easing-choice"> | 54 | <div data-montage-id="container_easing" class="container-easing-choice"> |
54 | <div data-montage-id="easing_choice" class="easing-choice"> | 55 | <div data-montage-id="easing_choice" class="easing-choice"> |
55 | ease-out | 56 | ease-out |
56 | </div> | 57 | </div> |
57 | </div> | 58 | </div> |
58 | </div> | 59 | </div> |
59 | 60 | ||
60 | </body> | 61 | </body> |
61 | </html> | 62 | </html> |
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 0d013fe5..53b016ec 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | var Montage = require("montage/core/core").Montage, | 32 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component; | 33 | Component = require("montage/ui/component").Component; |
33 | 34 | ||
34 | var Span = exports.Span = Montage.create(Component, { | 35 | var Span = exports.Span = Montage.create(Component, { |
35 | 36 | ||
@@ -37,7 +38,7 @@ var Span = exports.Span = Montage.create(Component, { | |||
37 | value: true | 38 | value: true |
38 | }, | 39 | }, |
39 | 40 | ||
40 | // BEGIN: Models | 41 | // BEGIN: Models |
41 | _spanWidth:{ | 42 | _spanWidth:{ |
42 | value:0 | 43 | value:0 |
43 | }, | 44 | }, |
@@ -51,185 +52,185 @@ var Span = exports.Span = Montage.create(Component, { | |||
51 | this.needsDraw = true; | 52 | this.needsDraw = true; |
52 | } | 53 | } |
53 | }, | 54 | }, |
54 | 55 | ||
55 | _isHighlighted: { | 56 | _isHighlighted: { |
56 | value: false | 57 | value: false |
57 | }, | 58 | }, |
58 | isHighlighted: { | 59 | isHighlighted: { |
59 | get: function() { | 60 | get: function() { |
60 | return this._isHighlighted; | 61 | return this._isHighlighted; |
61 | }, | 62 | }, |
62 | set: function(newVal) { | 63 | set: function(newVal) { |
63 | if (newVal !== this._isHighlighted) { | 64 | if (newVal !== this._isHighlighted) { |
64 | this._isHighlighted = newVal; | 65 | this._isHighlighted = newVal; |
65 | this.needsDraw = true; | 66 | this.needsDraw = true; |
66 | } | 67 | } |
67 | } | 68 | } |
68 | }, | 69 | }, |
69 | 70 | ||
70 | _areChoicesVisible: { | 71 | _areChoicesVisible: { |
71 | value: false | 72 | value: false |
72 | }, | 73 | }, |
73 | areChoicesVisible: { | 74 | areChoicesVisible: { |
74 | get: function() { | 75 | get: function() { |
75 | return this._areChoicesVisible; | 76 | return this._areChoicesVisible; |
76 | }, | 77 | }, |
77 | set: function(newVal) { | 78 | set: function(newVal) { |
78 | if (newVal !== this._areChoicesVisible) { | 79 | if (newVal !== this._areChoicesVisible) { |
79 | this._areChoicesVisible = newVal; | 80 | this._areChoicesVisible = newVal; |
80 | this.needsDraw = true; | 81 | this.needsDraw = true; |
81 | } | 82 | } |
82 | } | 83 | } |
83 | }, | 84 | }, |
84 | 85 | ||
85 | _easing: { | 86 | _easing: { |
86 | value: "none" | 87 | value: "none" |
87 | }, | 88 | }, |
88 | easing: { | 89 | easing: { |
89 | get: function() { | 90 | get: function() { |
90 | return this._easing; | 91 | return this._easing; |
91 | }, | 92 | }, |
92 | set: function(newVal) { | 93 | set: function(newVal) { |
93 | if (newVal !== this._easing) { | 94 | if (newVal !== this._easing) { |
94 | if (typeof(newVal) === "undefined") { |