Changeset 4923

Timestamp:

01/14/10 21:49:40 (3 years ago)

Author:

alfonsoml

Message:

#4773 make the fileBrowser plugin respect onClick handlers

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -51 +51 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4863">#4863</a> : Fixing iframedialog's height doesn't stretch to 100%</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4964">#4964</a> : The BACKSPACE key positioning was not correct in some cases with Firefox.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4773">#4773</a> : The fileBrowser plugin overwrote any onClick function for a fileButton element.</li>
         </ul>
         <h3>

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

@@ -279 +279 @@
                                 if ( url )
                                 {
-                                        element.onClick = uploadFile;
+                                        var onClick = element.onClick;
+                                        element.onClick = function( evt )
+                                        {
+                                                // "element" here means the definition object, so we need to find the correct
+                                                // button to scope the event call
+                                                var sender = evt.sender;
+                                                if ( onClick && onClick.call( sender, evt ) === false )
+                                                        return false;
+
+                                                return uploadFile.call( sender, evt );
+                                        };
+
                                         element.filebrowser.url = url;
                                         element.hidden = false;