diff options
author | Jose Antonio Marquez | 2012-06-25 11:52:28 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-25 11:52:28 -0700 |
commit | b435e97ff312eea15086069ce0ab6991acac32ff (patch) | |
tree | 542366a4fcd2df043ce91ec7a765ed18511bb70b /js/panels/color/colorpanelbase.reel | |
parent | 32c41a56fd870f28be70c9b9cfb4fe6dfbb16654 (diff) | |
download | ninja-b435e97ff312eea15086069ce0ab6991acac32ff.tar.gz |
Color Popup Test Candidate
Preliminary check in for testing to commence on new color popup functionality.
Diffstat (limited to 'js/panels/color/colorpanelbase.reel')
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.js | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js index bf2ada96..b3045db1 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js | |||
@@ -170,7 +170,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
170 | this.addButton('current', this.btnCurrent); | 170 | this.addButton('current', this.btnCurrent); |
171 | this.addButton('previous', this.btnPrevious); | 171 | this.addButton('previous', this.btnPrevious); |
172 | // | 172 | // |
173 | this.addButton('hexinput', this.hextext); | 173 | this.addButton('hexinput', this.hextext, this.colorManager); |
174 | this.addButton('reset', this.btnDefault); | 174 | this.addButton('reset', this.btnDefault); |
175 | this.addButton('nocolor', this.btnNoColor); | 175 | this.addButton('nocolor', this.btnNoColor); |
176 | this.addButton('swap', this.btnSwap); | 176 | this.addButton('swap', this.btnSwap); |
@@ -461,7 +461,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
461 | //////////////////////////////////////////////////////////////////// | 461 | //////////////////////////////////////////////////////////////////// |
462 | // | 462 | // |
463 | addButton: { | 463 | addButton: { |
464 | value: function (type, button) { | 464 | value: function (type, button, manager) { |
465 | // | 465 | // |
466 | switch (type.toLocaleLowerCase()) { | 466 | switch (type.toLocaleLowerCase()) { |
467 | case 'chip': | 467 | case 'chip': |
@@ -487,7 +487,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
487 | } | 487 | } |
488 | } else { | 488 | } else { |
489 | this.drawNoColor(this, this.cvs); | 489 | this.drawNoColor(this, this.cvs); |
490 | } | 490 | }9 |
491 | this.colorValue = c; | 491 | this.colorValue = c; |
492 | this.colorMode = m; | 492 | this.colorMode = m; |
493 | this.otherInput = false; | 493 | this.otherInput = false; |
@@ -677,8 +677,8 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
677 | case 'hexinput': | 677 | case 'hexinput': |
678 | var hexinp = HotText.create(); | 678 | var hexinp = HotText.create(); |
679 | hexinp.element = button; | 679 | hexinp.element = button; |
680 | hexinp.labelFunction = this._updateHexValue.bind(this); | 680 | hexinp.labelFunction = this._updateHexValue.bind(manager); |
681 | hexinp.inputFunction = this._hottextHexInput.bind(this); | 681 | hexinp.inputFunction = this._hottextHexInput.bind(manager); |
682 | hexinp.needsDraw = true; | 682 | hexinp.needsDraw = true; |
683 | this._buttons.hexinput.push(hexinp); | 683 | this._buttons.hexinput.push(hexinp); |
684 | return hexinp; | 684 | return hexinp; |
@@ -1248,23 +1248,23 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
1248 | } | 1248 | } |
1249 | //Checking for panel mode and converting the color to the panel mode | 1249 | //Checking for panel mode and converting the color to the panel mode |
1250 | if (this._panelMode === 'hsl') { | 1250 | if (this._panelMode === 'hsl') { |
1251 | rgb = this.colorManager.hexToRgb(color); | 1251 | rgb = this.hexToRgb(color); |
1252 | if (rgb) { | 1252 | if (rgb) { |
1253 | update = this.colorManager.rgbToHsl(rgb.r, rgb.g, rgb.b); | 1253 | update = this.rgbToHsl(rgb.r, rgb.g, rgb.b); |
1254 | update.wasSetByCode = false; | 1254 | update.wasSetByCode = false; |
1255 | update.type = 'change'; | 1255 | update.type = 'change'; |
1256 | this.colorManager.hsl = update; | 1256 | this.hsl = update; |
1257 | } else { | 1257 | } else { |
1258 | this.colorManager.applyNoColor(false); | 1258 | this.applyNoColor(false); |
1259 | } | 1259 | } |
1260 | } else { | 1260 | } else { |
1261 | update = this.colorManager.hexToRgb(color); | 1261 | update = this.hexToRgb(color); |
1262 | if (update) { | 1262 | if (update) { |
1263 | update.wasSetByCode = false; | 1263 | update.wasSetByCode = false; |
1264 | update.type = 'change'; | 1264 | update.type = 'change'; |
1265 | this.colorManager.rgb = update; | 1265 | this.rgb = update; |
1266 | } else { | 1266 | } else { |
1267 | this.colorManager.applyNoColor(false); | 1267 | this.applyNoColor(false); |
1268 | } | 1268 | } |
1269 | } | 1269 | } |
1270 | } | 1270 | } |
@@ -1273,7 +1273,7 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
1273 | // | 1273 | // |
1274 | _updateHexValue: { | 1274 | _updateHexValue: { |
1275 | value: function (v) { | 1275 | value: function (v) { |
1276 | return this.colorManager.hex; | 1276 | return this.hex; |
1277 | } | 1277 | } |
1278 | }, | 1278 | }, |
1279 | //////////////////////////////////////////////////////////////////// | 1279 | //////////////////////////////////////////////////////////////////// |