Changeset 345

Timestamp:

2007-06-01 20:12:07 (20 months ago)

Author:

alfonsoml

Message:

Fix for #527, ignore bad entries in the Toolbar configuration.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fcktoolbarset.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fcktoolbarset.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
@@ -241 +241 @@
                 var oToolbarItems = ToolbarSet[x] ;
 
+                // If the configuration for the toolbar is missing some element or has any extra comma
+                // this item won't be valid, so skip it and keep on processing.
+                if ( !oToolbarItems ) 
+                        continue ;
+
                 var oToolbar ;
 

FCKeditor/trunk/_whatsnew.html

@@ -132 +132 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/281">#281</a>] Custom
                         toolbar buttons now render correctly in all skins.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/527">#527</a>] If the configuration
+                        for a toolbar isn't fuly valid, try to keep on parsing it.</li>
         </ul>
         <h3>