diff options
| author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
| commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
| tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/components/colorbar.reel | |
| parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/colorbar.reel')
| -rwxr-xr-x | js/components/colorbar.reel/colorbar.html | 4 | ||||
| -rwxr-xr-x | js/components/colorbar.reel/colorbar.js | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html index 2e189c87..5018b1f4 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html | |||
| @@ -6,11 +6,9 @@ | |||
| 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 7 | </copyright> | 7 | </copyright> |
| 8 | --> | 8 | --> |
| 9 | <html lang="en"> | 9 | <html> |
| 10 | <head> | 10 | <head> |
| 11 | 11 | ||
| 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 13 | |||
| 14 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> | 12 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> |
| 15 | 13 | ||
| 16 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |
diff --git a/js/components/colorbar.reel/colorbar.js b/js/components/colorbar.reel/colorbar.js index e547b9bc..e5dd84cf 100755 --- a/js/components/colorbar.reel/colorbar.js +++ b/js/components/colorbar.reel/colorbar.js | |||
| @@ -19,28 +19,22 @@ exports.ColorBar = Montage.create(Component, { | |||
| 19 | //////////////////////////////////////////////////////////////////// | 19 | //////////////////////////////////////////////////////////////////// |
| 20 | //Width of spectrum (not including b/w buttons) | 20 | //Width of spectrum (not including b/w buttons) |
| 21 | _colorBarSpectrumWidth: { | 21 | _colorBarSpectrumWidth: { |
| 22 | enumerable: false, | ||
| 23 | value: null | 22 | value: null |
| 24 | }, | 23 | }, |
| 25 | //////////////////////////////////////////////////////////////////// | 24 | //////////////////////////////////////////////////////////////////// |
| 26 | //Width of spectrum steps (used to calculate size of B/W buttons) | 25 | //Width of spectrum steps (used to calculate size of B/W buttons) |
| 27 | _colorBarSpectrumWidthSteps: { | 26 | _colorBarSpectrumWidthSteps: { |
| 28 | enumerable: false, | ||
| 29 | value: 10 | 27 | value: 10 |
| 30 | }, | 28 | }, |
| 31 | //////////////////////////////////////////////////////////////////// | 29 | //////////////////////////////////////////////////////////////////// |
| 32 | //Default value | 30 | //Default value |
| 33 | _value: { | 31 | _value: { |
| 34 | enumerable: false, | ||
| 35 | value: {h: 0, s: 0, v: 0} | 32 | value: {h: 0, s: 0, v: 0} |
| 36 | }, | 33 | }, |
| 37 | //////////////////////////////////////////////////////////////////// | 34 | //////////////////////////////////////////////////////////////////// |
| 38 | //HSV Value selected from bar | 35 | //HSV Value selected from bar |
| 39 | value: { | 36 | value: { |
| 40 | enumerable: true, | 37 | get: function() {return this._value;}, |
| 41 | get: function() { | ||
| 42 | return this._value; | ||
| 43 | }, | ||
| 44 | set: function(value) { | 38 | set: function(value) { |
| 45 | if (value) { | 39 | if (value) { |
| 46 | //Checking for limits (Max and Min HSV values) | 40 | //Checking for limits (Max and Min HSV values) |
| @@ -73,7 +67,6 @@ exports.ColorBar = Montage.create(Component, { | |||
| 73 | //////////////////////////////////////////////////////////////////// | 67 | //////////////////////////////////////////////////////////////////// |
| 74 | // | 68 | // |
| 75 | prepareForDraw: { | 69 | prepareForDraw: { |
| 76 | enumerable: false, | ||
| 77 | value: function() { | 70 | value: function() { |
| 78 | //Nothing | 71 | //Nothing |
| 79 | } | 72 | } |
| @@ -81,7 +74,6 @@ exports.ColorBar = Montage.create(Component, { | |||
| 81 | //////////////////////////////////////////////////////////////////// | 74 | //////////////////////////////////////////////////////////////////// |
| 82 | //Setting up and drawing canvas to object | 75 | //Setting up and drawing canvas to object |
| 83 | willDraw: { | 76 | willDraw: { |
| 84 | enumerable: false, | ||
| 85 | value: function() { | 77 | value: function() { |
| 86 | //Setting the width and height of the canvas to match container | 78 | //Setting the width and height of the canvas to match container |
| 87 | this.element.width = parseInt(window.getComputedStyle(this.element, null).width); | 79 | this.element.width = parseInt(window.getComputedStyle(this.element, null).width); |
| @@ -168,7 +160,6 @@ exports.ColorBar = Montage.create(Component, { | |||
| 168 | //////////////////////////////////////////////////////////////////// | 160 | //////////////////////////////////////////////////////////////////// |
| 169 | //Used to check mouse mode and display cursor | 161 | //Used to check mouse mode and display cursor |
| 170 | _isMouseDown: { | 162 | _isMouseDown: { |
| 171 | enumerable: false, | ||
| 172 | value: false | 163 | value: false |
| 173 | }, | 164 | }, |
| 174 | //////////////////////////////////////////////////////////////////// | 165 | //////////////////////////////////////////////////////////////////// |
| @@ -224,4 +215,5 @@ exports.ColorBar = Montage.create(Component, { | |||
| 224 | } | 215 | } |
| 225 | } | 216 | } |
| 226 | //////////////////////////////////////////////////////////////////// | 217 | //////////////////////////////////////////////////////////////////// |
| 218 | //////////////////////////////////////////////////////////////////// | ||
| 227 | }); \ No newline at end of file | 219 | }); \ No newline at end of file |