diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/color/colorpanelpopup.reel | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel')
4 files changed, 548 insertions, 544 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index bf6a83b4..0d9c809c 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.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,14 +30,14 @@ 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 | 34 | ||
34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 35 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
35 | 36 | ||
36 | <link rel="stylesheet" type="text/css" href="css/colorpanelpopup.css"> | 37 | <link rel="stylesheet" type="text/css" href="css/colorpanelpopup.css"> |
37 | 38 | ||
38 | <script type="text/montage-serialization"> | 39 | <script type="text/montage-serialization"> |
39 | { | 40 | { |
40 | "owner": { | 41 | "owner": { |
41 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", | 42 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", |
42 | "properties": { | 43 | "properties": { |
@@ -56,52 +57,52 @@ POSSIBILITY OF SUCH DAMAGE. | |||
56 | "btnPalette": {"#": "btn_palettes"}, | 57 | "btnPalette": {"#": "btn_palettes"}, |
57 | "btnNocolor": {"#": "btn_nocolor"}, | 58 | "btnNocolor": {"#": "btn_nocolor"}, |
58 | "inputHex": {"#": "input_hex"} | 59 | "inputHex": {"#": "input_hex"} |
59 | 60 | ||
60 | } | 61 | } |
61 | } | 62 | } |
62 | } | 63 | } |
63 | </script> | 64 | </script> |
64 | 65 | ||
65 | </head> | 66 | </head> |
66 | 67 | ||
67 | <body> | 68 | <body> |
68 | 69 | ||
69 | <div data-montage-id="cpp_popup" class="cpp_popup"> | 70 | <div data-montage-id="cpp_popup" class="cpp_popup"> |
70 | <div class="cp_pu_options"> | 71 | <div class="cp_pu_options"> |
71 | 72 | ||
72 | <div class="cp_pu_history"> | 73 | <div class="cp_pu_history"> |
73 | 74 | ||
74 | <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> | 75 | <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> |
75 | <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> | 76 | <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> |
76 | 77 | ||
77 | </div> | 78 | </div> |
78 | 79 | ||
79 | <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> | 80 | <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> |
80 | 81 | ||
81 | <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> | 82 | <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> |
82 | <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> | 83 | <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> |
83 | <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> | 84 | <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> |
84 | <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> | 85 | <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> |
85 | <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> | 86 | <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> |
86 | 87 | ||
87 | </div> | 88 | </div> |
88 | 89 | ||
89 | <div class="cp_pu_content"> | 90 | <div class="cp_pu_content"> |
90 | <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> | 91 | <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> |
91 | <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> | 92 | <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> |
92 | <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> | 93 | <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> |
93 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> | 94 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> |
94 | </div> | 95 | </div> |
95 | 96 | ||
96 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> | 97 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> |
97 | <div class="cp_pu_a_label">Alpha</div> | 98 | <div class="cp_pu_a_label">Alpha</div> |
98 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> | 99 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> |
99 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> | 100 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> |
100 | <div class="cp_pu_a_label2">%</div> | 101 | <div class="cp_pu_a_label2">%</div> |
101 | </div> | 102 | </div> |
102 | 103 | ||
103 | </div> | 104 | </div> |
104 | 105 | ||
105 | </body> | 106 | </body> |
106 | 107 | ||
107 | </html> | 108 | </html> |
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js index 83d4e6ed..0b96778c 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.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 |