Changeset 1566

Timestamp:

2008-02-19 17:35:07 (7 months ago)

Author:

wwalc

Message:

Fix for #1693 - Custom error messages are now properly displayed in the file browser

Location:

FCKeditor/trunk

Files:

• editor/filemanager/browser/default/browser.html (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/browser/default/browser.html

@@ -141 +141 @@
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
-        window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
+        if (errorNumber == "1")
+                window.frames['frmUpload'].OnUploadCompleted( errorNumber, customMsg ) ;
+        else
+                window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -107 +107 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1670">#1670</a>] Improved the background color
                         behind smiley icons and special characters in their corresponding dialogs.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1693">#1693</a>] Custom error messages are now 
+                        properly displayed in the file browser.</li>
         </ul>
         <p>