Skip to content

Commit f3f3387

Browse files
committed
Update the color picker to version 1.4
1 parent bfeab41 commit f3f3387

13 files changed

+12
-9
lines changed

assets/mootools/colorpicker/1.3/js/mooRainbow-uncompressed.js assets/mootools/colorpicker/1.4/js/mooRainbow-uncompressed.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ var MooRainbow = new Class({
482482
var B = R.clone().inject(box).addClass(prefix + 'bLabel').appendText('B: ');
483483
R.appendText('R: ').addClass(prefix + 'rLabel');
484484

485-
var inputR = new Element('input').set('disabled', true);
485+
var inputR = new Element('input').set('disabled', true); // PATCH
486486
var inputG = inputR.clone().inject(G).addClass(prefix + 'gInput');
487487
var inputB = inputR.clone().inject(B).addClass(prefix + 'bInput');
488488
inputR.inject(R).addClass(prefix + 'rInput');
@@ -492,7 +492,7 @@ var MooRainbow = new Class({
492492
var BR = HU.clone().inject(box).addClass(prefix + 'BrighLabel').appendText('B: ');
493493
HU.appendText('H: ').addClass(prefix + 'HueLabel');
494494

495-
var inputHU = new Element('input').set('disabled', true);
495+
var inputHU = new Element('input').set('disabled', true); // PATCH
496496
var inputSA = inputHU.clone().inject(SA).addClass(prefix + 'SatuInput');
497497
var inputBR = inputHU.clone().inject(BR).addClass(prefix + 'BrighInput');
498498
inputHU.inject(HU).addClass(prefix + 'HueInput');
@@ -537,7 +537,7 @@ var MooRainbow = new Class({
537537
var coords = this.element.getCoordinates();
538538
this.layout.setStyles({
539539
'left': coords.left - 325, // PATCH: - 325
540-
'top': coords.top + coords.height + 8
540+
'top': coords.top + coords.height + 8 // PATCH: + 8
541541
});
542542
},
543543

system/config/constants.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
define('HIGHLIGHTER', '3.0.83');
3131
define('HTML5SHIV', '3.7.0');
3232
define('SWIPE', '2.0');
33-
define('JQUERY', '1.10.2');
34-
define('JQUERY_UI', '1.10.3');
35-
define('COLORBOX', '1.4.31');
36-
define('MEDIAELEMENT', '2.13.1');
33+
define('JQUERY', '1.10.2'); # FIXME
34+
define('JQUERY_UI', '1.10.3'); # FIXME
35+
define('COLORBOX', '1.4.31'); # FIXME
36+
define('MEDIAELEMENT', '2.13.1'); # FIXME
3737
define('TABLESORTER', '2.0.5');
3838
define('MOOTOOLS', '1.4.5');
39-
define('COLORPICKER', '1.3');
39+
define('COLORPICKER', '1.4');
4040
define('DATEPICKER', '2.2.0');
4141
define('MEDIABOX', '1.4.6');
4242
define('SIMPLEMODAL', '1.2');

system/docs/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
44
Version 3.3.RC1 (2014-XX-XX)
55
----------------------------
66

7+
### Update
8+
Update the color picker to version 1.4.
9+
710
### Changed
811
Use the "bootstrap" theme for the date picker (see #6692).
912

system/modules/core/config/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
'MEDIAELEMENT' => '2.13.1',
457457
'TABLESORTER' => '2.0.5',
458458
'MOOTOOLS' => '1.4.5',
459-
'COLORPICKER' => '1.3',
459+
'COLORPICKER' => '1.4',
460460
'DATEPICKER' => '2.2.0',
461461
'MEDIABOX' => '1.4.6',
462462
'SIMPLEMODAL' => '1.2',

0 commit comments

Comments
 (0)