diff options
| author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
| commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
| tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/components | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components')
60 files changed, 1108 insertions, 416 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js index 8df868a2..a6c3ff6d 100755 --- a/js/components/SliderBase.js +++ b/js/components/SliderBase.js | |||
| @@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 83 | } | 83 | } |
| 84 | this.needsDraw = true; | 84 | this.needsDraw = true; |
| 85 | } | 85 | } |
| 86 | } | 86 | }, |
| 87 | serializable: true | ||
| 87 | }, | 88 | }, |
| 88 | 89 | ||
| 89 | // Internal flags to determine what the change/changing events will contain | 90 | // Internal flags to determine what the change/changing events will contain |
| @@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 153 | } | 154 | } |
| 154 | this.needsDraw = true; | 155 | this.needsDraw = true; |
| 155 | } | 156 | } |
| 156 | } | 157 | }, |
| 158 | serializable: true | ||
| 157 | }, | 159 | }, |
| 158 | 160 | ||
| 159 | _maxValue: { | 161 | _maxValue: { |
| @@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 175 | } | 177 | } |
| 176 | this.needsDraw = true; | 178 | this.needsDraw = true; |
| 177 | } | 179 | } |
| 178 | } | 180 | }, |
| 181 | serializable: true | ||
| 179 | }, | 182 | }, |
| 180 | 183 | ||
| 181 | _valueCoef: { | 184 | _valueCoef: { |
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 | ||