diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/components/colorbar.reel | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/components/colorbar.reel')
-rwxr-xr-x | js/components/colorbar.reel/colorbar.html | 71 | ||||
-rwxr-xr-x | js/components/colorbar.reel/colorbar.js | 259 | ||||
-rwxr-xr-x | js/components/colorbar.reel/css/colorbar.css | 23 | ||||
-rwxr-xr-x | js/components/colorbar.reel/css/colorbar.scss | 25 |
4 files changed, 191 insertions, 187 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html index e61cc2f2..83e44c32 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html | |||
@@ -1,26 +1,27 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- | 2 | <!-- |
3 | <copyright> | 3 | <copyright> |
4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
5 | All Rights Reserved. | 5 | All Rights Reserved. |
6 | BSD License. | ||
7 | 6 | ||
8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
10 | 9 | ||
11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
17 | may be used to endorse or promote products derived from this software | 16 | |
18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
18 | contributors may be used to endorse or promote products derived from this | ||
19 | software without specific prior written permission. | ||
19 | 20 | ||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -31,28 +32,28 @@ POSSIBILITY OF SUCH DAMAGE. | |||
31 | </copyright> | 32 | </copyright> |
32 | --> | 33 | --> |
33 | <html> | 34 | <html> |
34 | <head> | 35 | <head> |
35 | 36 | ||
36 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> | 37 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> |
37 | 38 | ||
38 | <script type="text/montage-serialization"> | 39 | <script type="text/montage-serialization"> |
39 | { | 40 | { |
40 | "owner": { | 41 | "owner": { |
41 | "prototype": "js/components/colorbar.reel[ColorBar]", | 42 | "prototype": "js/components/colorbar.reel[ColorBar]", |
42 | "properties": { | 43 | "properties": { |
43 | "element": {"#": "colorbar"} | 44 | "element": {"#": "colorbar"} |
44 | 45 | ||
45 | } | 46 | } |
46 | } | 47 | } |
47 | } | 48 | } |
48 | </script> | 49 | </script> |
49 | 50 | ||
50 | </head> | 51 | </head> |
51 | 52 | ||
52 | <body> | 53 | <body> |
53 | 54 | ||
54 | <canvas data-montage-id="colorbar" class="colorbar"></canvas> | 55 | <canvas data-montage-id="colorbar" class="colorbar"></canvas> |
55 | 56 | ||
56 | </body> | 57 | </body> |
57 | 58 | ||
58 | </html> | 59 | </html> |
diff --git a/js/components/colorbar.reel/colorbar.js b/js/components/colorbar.reel/colorbar.js index 4f3577d9..524f3c55 100755 --- a/js/components/colorbar.reel/colorbar.js +++ b/js/components/colorbar.reel/colorbar.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 |
@@ -30,152 +31,152 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | 31 | ||
31 | //////////////////////////////////////////////////////////////////////// | 32 | //////////////////////////////////////////////////////////////////////// |
32 | // | 33 | // |
33 | var Montage = require("montage/core/core").Montage, | 34 | var Montage = require("montage/core/core").Montage, |
34 | Component = require("montage/ui/component").Component; | 35 | Component = require("montage/ui/component").Component; |
35 | //////////////////////////////////////////////////////////////////////// | 36 | //////////////////////////////////////////////////////////////////////// |
36 | //Exporting as ColorBar | 37 | //Exporting as ColorBar |
37 | exports.ColorBar = Montage.create(Component, { | 38 | exports.ColorBar = Montage.create(Component, { |
38 | //////////////////////////////////////////////////////////////////// | 39 | //////////////////////////////////////////////////////////////////// |
39 | //No reel needed since it's just a bar component | 40 | //No reel needed since it's just a bar component |
40 | hasTemplate: { | 41 | hasTemplate: { |
41 | value: true | 42 | value: true |
42 | }, | 43 | }, |
43 | //////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////// |
44 | //Width of spectrum (not including b/w buttons) | 45 | //Width of spectrum (not including b/w buttons) |
45 | _colorBarSpectrumWidth: { | 46 | _colorBarSpectrumWidth: { |
46 | value: null | 47 | value: null |
47 | }, | 48 | }, |
48 | //////////////////////////////////////////////////////////////////// | 49 | //////////////////////////////////////////////////////////////////// |
49 | //Width of spectrum steps (used to calculate size of B/W buttons) | 50 | //Width of spectrum steps (used to calculate size of B/W buttons) |
50 | _colorBarSpectrumWidthSteps: { | 51 | _colorBarSpectrumWidthSteps: { |
51 | value: 10 | 52 | value: 10 |
52 | }, | 53 | }, |
53 | //////////////////////////////////////////////////////////////////// | 54 | //////////////////////////////////////////////////////////////////// |
54 | //Default value | 55 | //Default value |
55 | _value: { | 56 | _value: { |
56 | value: {h: 0, s: 0, v: 0} | 57 | value: {h: 0, s: 0, v: 0} |
57 | }, | 58 | }, |
58 | //////////////////////////////////////////////////////////////////// | 59 | //////////////////////////////////////////////////////////////////// |
59 | //HSV Value selected from bar | 60 | //HSV Value selected from bar |
60 | value: { | 61 | value: { |
61 | get: function() {return this._value;}, | 62 | get: function() {return this._value;}, |
62 | set: function(value) { | 63 | set: function(value) { |
63 | if (value) { | 64 | if (value) { |
64 | //Checking for limits (Max and Min HSV values) | 65 | //Checking for limits (Max and Min HSV values) |
65 | if (value.h > Math.PI*2) { | 66 | if (value.h > Math.PI*2) { |
66 | value.h = Math.PI*2; | 67 | value.h = Math.PI*2; |
67 | } else if (value.h < 0) { | 68 | } else if (value.h < 0) { |
68 | value.h = 0; | 69 | value.h = 0; |
69 | } | 70 | } |
70 | // | 71 | // |
71 | if (value.s > 1) { | 72 | if (value.s > 1) { |
72 | value.s = 1; | 73 | value.s = 1; |
73 | } else if (value.s < 0) { | 74 | } else if (value.s < 0) { |
74 | value.s = 0; | 75 | value.s = 0; |
75 | } | 76 | } |
76 | // | 77 | // |
77 | if (value.v > 1) { | 78 | if (value.v > 1) { |
78 | value.v = 1; | 79 | value.v = 1; |
79 |