Changeset 4918

Timestamp:

01/12/10 19:46:21 (3 years ago)

Author:

alfonsoml

Message:

#4640 Little optimizations in the filebrowser plugin

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/filebrowser/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -48 +48 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4637">#4637</a> : Table cells' 'nowrap' attribute is not loaded to cell property dialog. Thanks to pomu0325.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4724">#4724</a> : Using the mouse to insert a link in IE might create incorrect results.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4640">#4640</a> : Small optimizations for the fileBrowser plugin.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/filebrowser/plugin.js

@@ -336 +336 @@
                 }
 
-                return ( definition.getContents( tabId ).get( elementId ).filebrowser && definition.getContents( tabId ).get( elementId ).filebrowser.url );
+                var elementFileBrowser = definition.getContents( tabId ).get( elementId ).filebrowser;
+                return ( elementFileBrowser && elementFileBrowser.url );
         }
 
@@ -367 +368 @@
                         CKEDITOR.on( 'dialogDefinition', function( evt )
                         {
+                                var definition = evt.data.definition,
+                                        element;
                                 // Associate filebrowser to elements with 'filebrowser' attribute.
-                                for ( var i in evt.data.definition.contents )
+                                for ( var i in definition.contents )
                                 {
-                                        attachFileBrowser( evt.editor, evt.data.name, evt.data.definition, evt.data.definition.contents[ i ].elements );
-                                        if ( evt.data.definition.contents[ i ].hidden && evt.data.definition.contents[ i ].filebrowser )
+                                        element = definition.contents[ i ] ;
+                                        attachFileBrowser( evt.editor, evt.data.name, definition, element.elements );
+                                        if ( element.hidden && element.filebrowser )
                                         {
-                                                evt.data.definition.contents[ i ].hidden =
-                                                        !isConfigured( evt.data.definition, evt.data.definition.contents[ i ][ 'id' ], evt.data.definition.contents[ i ].filebrowser );
+                                                element.hidden = !isConfigured( definition, element[ 'id' ], element.filebrowser );
                                         }
                                 }