Skip to content
Permalink
Browse files

Merge branch 't/13266'

  • Loading branch information...
pjasiun committed May 8, 2015
2 parents 5faccb5 + 43f222d commit 53c2dc16728e8fd144c87951c63232412d160c68
Showing with 7 additions and 7 deletions.
  1. +2 −0 CHANGES.md
  2. +5 −7 plugins/colordialog/dialogs/colordialog.js
@@ -20,6 +20,8 @@ Other Changes:

* [#12844](http://dev.ckeditor.com/ticket/12844) and [#13103](http://dev.ckeditor.com/ticket/13103): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.3`.
* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licenses, removed `truncated-mathjax/` from the `tests/` directory. Now `bender.config.mathJaxLibPath` must be configured manually in order to run MathJax plugin's tests.
* [#13266](http://dev.ckeditor.com/ticket/13266): Added more shades of gray.


## CKEditor 4.4.7

@@ -236,14 +236,12 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
oRow.setAttribute( 'role', 'row' );

// Create the gray scale colors cells.
for ( var n = 0; n < 6; n++ ) {
appendColorCell( oRow.$, '#' + aColors[ n ] + aColors[ n ] + aColors[ n ] );
}

// Fill the row with black cells.
for ( var i = 0; i < 12; i++ ) {
appendColorCell( oRow.$, '#000000' );
appendColorCell( oRow.$, '#000000' );
for ( var n = 0; n < 16; n++ ) {
var c = n.toString( 16 );
appendColorCell( oRow.$, '#' + c + c + c + c + c + c );
}
appendColorCell( oRow.$, '#ffffff' );
}

var numbering = function( id ) {

0 comments on commit 53c2dc1

Please sign in to comment.
You can’t perform that action at this time.