Changeset 1144

Timestamp:

11/30/07 18:29:02 (5 years ago)

Author:

fredck

Message:

Fixed #1597 : The color boxes are now properly rendered in the color selector panels on sample14.html.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/commandclasses/fcktextcolorcommand.js (modified) (1 diff)

FCKeditor/trunk/_whatsnew.html

@@ -151 +151 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1594">#1594</a>] Undo/Redo
                         will now work properly for the color selectors.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1597">#1597</a>] The color
+                        boxes are now properly rendered in the color selector panels on sample14.html.</li>
         </ul>
         <h3>

FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js

@@ -159 +159 @@
                 var oRow = oTable.insertRow(-1) ;
 
-                for ( var i = 0 ; i < 8 && iCounter < aColors.length ; i++, iCounter++ )
+                for ( var i = 0 ; i < 8 ; i++, iCounter++ )
                 {
-                        var colorParts = aColors[iCounter].split('/') ;
-                        var colorValue = '#' + colorParts[0] ;
-                        var colorName = colorParts[1] || colorValue ;
+                        // The div will be created even if no more colors are available.
+                        // Extra divs will be hidden later in the code. (#1597)
+                        if ( iCounter < aColors.length )
+                        {
+                                var colorParts = aColors[iCounter].split('/') ;
+                                var colorValue = '#' + colorParts[0] ;
+                                var colorName = colorParts[1] || colorValue ;
+                        }
 
                         oDiv = oRow.insertCell(-1).appendChild( CreateSelectionDiv() ) ;
                         oDiv.innerHTML = '<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: ' + colorValue + '"></div></div>' ;
 
-                        FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
+                        if ( iCounter >= aColors.length )
+                                oDiv.style.visibility = 'hidden' ;
+                        else
+                                FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
                 }
         }