Ticket #2173: 2173_2.patch

_whatsnew.html

@@ -51 +51 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2163">#2163</a>] If the FCKConfig.DocType
                         setting points to a HTML DocType then the output won't generate self-closing tags (it will output 
                         &lt;img &gt; instead of &lt;img /&gt;).</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2173">#2173</a>] A throbber will
+                        be shown in the Quick Uploads.</li>
         </ul>
         <p>
                 Fixed Bugs:</p>

editor/dialog/fck_flash/fck_flash.js

@@ -236 +236 @@
 
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
+        // Remove animation
+        window.parent.Throbber.Hide() ;
+        GetE( 'divUpload' ).style.display  = '' ;
+
         switch ( errorNumber )
         {
                 case 0 :        // No errors
@@ -288 +292 @@
                 return false ;
         }
 
+        // Show animation
+        window.parent.Throbber.Show( 100 ) ;
+        GetE( 'divUpload' ).style.display  = 'none' ;
+
         return true ;
 }

editor/dialog/fck_image/fck_image.js

@@ -447 +447 @@
 
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
+        // Remove animation
+        window.parent.Throbber.Hide() ;
+        GetE( 'divUpload' ).style.display  = '' ;
+
         switch ( errorNumber )
         {
                 case 0 :        // No errors
@@ -500 +504 @@
                 return false ;
         }
 
+        // Show animation
+        window.parent.Throbber.Show( 100 ) ;
+        GetE( 'divUpload' ).style.display  = 'none' ;
+
         return true ;
 }

editor/dialog/fck_link/fck_link.js

@@ -650 +650 @@
 
 function SetUrl( url )
 {
-        document.getElementById('txtUrl').value = url ;
+        GetE('txtUrl').value = url ;
         OnUrlChange() ;
         dialog.SetSelectedTab( 'Info' ) ;
 }
 
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
+        // Remove animation
+        window.parent.Throbber.Hide() ;
+        GetE( 'divUpload' ).style.display  = '' ;
+
         switch ( errorNumber )
         {
                 case 0 :        // No errors
@@ -709 +713 @@
                 return false ;
         }
 
+        // Show animation
+        window.parent.Throbber.Show( 100 ) ;
+        GetE( 'divUpload' ).style.display  = 'none' ;
+
         return true ;
 }
 

editor/fckdialog.html

@@ -245 +245 @@
 
                         var throbberParent = $( 'throbberBlock' ) ;
 
-                        // Create the throbber blocks.
-                        var classIds = [ 1,2,3,4,5,4,3,2 ] ;
-                        while ( classIds.length > 0 )
-                                throbberParent.appendChild( document.createElement( 'div' ) ).className = ' throbber_' + classIds.shift() ;
+                        if (throbberParent.childNodes.length == 0)
+                        {
+                                // Create the throbber blocks.
+                                var classIds = [ 1,2,3,4,5,4,3,2 ] ;
+                                while ( classIds.length > 0 )
+                                        throbberParent.appendChild( document.createElement( 'div' ) ).className = ' throbber_' + classIds.shift() ;
+                        }
 
                         // Center the throbber.
                         var frm = $( 'contents' ) ;
@@ -261 +264 @@
                         // Show it.
                         throbberParent.style.visibility = ''  ;
 
+                        // Hide tabs and buttons:
+                        $( 'Tabs' ).style.visibility = 'hidden' ;
+                        $( 'PopupButtons' ).style.visibility = 'hidden' ;
+
                         // Setup the animation interval.
                         timer = setInterval( updateThrobber, 100 ) ;
                 },
@@ -273 +280 @@
                                 timer = null ;
                         }
 
-                        var throbberParent = document.getElementById( 'throbberBlock' ) ;
-                        if ( throbberParent )
-                                FCKDomTools.RemoveNode( throbberParent ) ;
+                        $( 'throbberBlock' ).style.visibility = 'hidden' ;
+
+                        // Show tabs and buttons:
+                        $( 'Tabs' ).style.visibility = '' ;
+                        $( 'PopupButtons' ).style.visibility = '' ;
                 }
         } ;
 }() ;