Index: _whatsnew.html =================================================================== --- _whatsnew.html (revision 2023) +++ _whatsnew.html (working copy) @@ -51,6 +51,8 @@
Fixed Bugs:
Index: editor/dialog/fck_flash/fck_flash.js =================================================================== --- editor/dialog/fck_flash/fck_flash.js (revision 2023) +++ editor/dialog/fck_flash/fck_flash.js (working copy) @@ -236,6 +236,10 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { case 0 : // No errors @@ -288,5 +292,9 @@ return false ; } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: editor/dialog/fck_image/fck_image.js =================================================================== --- editor/dialog/fck_image/fck_image.js (revision 2023) +++ editor/dialog/fck_image/fck_image.js (working copy) @@ -447,6 +447,10 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { case 0 : // No errors @@ -500,5 +504,9 @@ return false ; } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: editor/dialog/fck_link/fck_link.js =================================================================== --- editor/dialog/fck_link/fck_link.js (revision 2023) +++ editor/dialog/fck_link/fck_link.js (working copy) @@ -650,13 +650,17 @@ 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,6 +713,10 @@ return false ; } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: editor/fckdialog.html =================================================================== --- editor/fckdialog.html (revision 2023) +++ editor/fckdialog.html (working copy) @@ -245,10 +245,13 @@ 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,6 +264,10 @@ // 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,9 +280,11 @@ 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 = '' ; } } ; }() ;