vanilla ckeditor-3.4.2

[ckeditor.git] / _source / plugins / colordialog / dialogs / colordialog.js

diff --git a/_source/plugins/colordialog/dialogs/colordialog.js b/_source/plugins/colordialog/dialogs/colordialog.js
index 4454d19..4f1db21 100644 (file)
--- a/_source/plugins/colordialog/dialogs/colordialog.js
+++ b/_source/plugins/colordialog/dialogs/colordialog.js
@@ -14,13 +14,11 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                // Reference the dialog.\r
                var dialog;\r
 \r
-               function spacer()\r
+               var spacer =\r
                {\r
-                       return {\r
-                               type : 'html',\r
-                               html : ' '\r
-                       };\r
-               }\r
+                       type : 'html',\r
+                       html : ' '\r
+               };\r
 \r
                function clearSelected()\r
                {\r
@@ -30,11 +28,11 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 \r
                function updateSelected( evt )\r
                {\r
-                       if ( ! (evt instanceof CKEDITOR.dom.event ) )\r
+                       if ( ! ( evt instanceof CKEDITOR.dom.event ) )\r
                                evt = new CKEDITOR.dom.event( evt );\r
 \r
                        var target = evt.getTarget(),\r
-                                       color;\r
+                               color;\r
 \r
                        if ( target.getName() == 'a' && ( color = target.getChild( 0 ).getHtml() ) )\r
                                dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color );\r
@@ -42,7 +40,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 \r
                function updateHighlight( event )\r
                {\r
-                       if ( ! (event instanceof CKEDITOR.dom.event ) )\r
+                       if ( ! ( event instanceof CKEDITOR.dom.event ) )\r
                                event = event.data;\r
 \r
                        var target = event.getTarget(),\r
@@ -61,21 +59,19 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                        $doc.getById( hicolorTextId ).setHtml( ' ' );\r
                }\r
 \r
-               var onMouseout = $tools.addFunction( clearHighlight );\r
-\r
-               var onClick = updateSelected,\r
-                               onClickHandler = CKEDITOR.tools.addFunction( onClick );\r
-\r
-               var onFocus = updateHighlight,\r
-                               onBlur = clearHighlight;\r
+               var onMouseout = $tools.addFunction( clearHighlight ),\r
+                       onClick = updateSelected,\r
+                       onClickHandler = CKEDITOR.tools.addFunction( onClick ),\r
+                       onFocus = updateHighlight,\r
+                       onBlur = clearHighlight;\r
 \r
                var onKeydownHandler = CKEDITOR.tools.addFunction( function( ev )\r
                {\r
                        ev = new CKEDITOR.dom.event( ev );\r
                        var element = ev.getTarget();\r
                        var relative, nodeToMove;\r
-                       var keystroke = ev.getKeystroke();\r
-                       var rtl = editor.lang.dir == 'rtl';\r
+                       var keystroke = ev.getKeystroke(),\r
+                               rtl = editor.lang.dir == 'rtl';\r
 \r
                        switch ( keystroke )\r
                        {\r
@@ -177,14 +173,14 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                function createColorTable()\r
                {\r
                        // Create the base colors array.\r
-                       var aColors = ['00','33','66','99','cc','ff'];\r
+                       var aColors = [ '00', '33', '66', '99', 'cc', 'ff' ];\r
 \r
                        // This function combines two ranges of three values from the color array into a row.\r
                        function appendColorRow( rangeA, rangeB )\r
                        {\r
                                for ( var i = rangeA ; i < rangeA + 3 ; i++ )\r
                                {\r
-                                       var row = table.$.insertRow(-1);\r
+                                       var row = table.$.insertRow( -1 );\r
 \r
                                        for ( var j = rangeB ; j < rangeB + 3 ; j++ )\r
                                        {\r
@@ -287,7 +283,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                                                                                firstColor.focus();\r
                                                                        }\r
                                                                },\r
-                                                               spacer(),\r
+                                                               spacer,\r
                                                                {\r
                                                                        type : 'vbox',\r
                                                                        padding : 0,\r
@@ -320,7 +316,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                                                                                                }\r
                                                                                        }\r
                                                                                },\r
-                                                                               spacer(),\r
+                                                                               spacer,\r
                                                                                {\r
                                                                                        type : 'button',\r
                                                                                        id : 'clear',\r