From dd70fcd5be86768b982a190b495e6a0298868df0 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 19 Jul 2010 02:16:21 +0000 Subject: [PATCH] BUGFIX AssetAdmin->doUpload() shows JS alert *before* triggering a page reload, as this seems to mess up TinyMCE in Firefox on subsequent page loads (fixes #5838) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108096 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 2e06b73e..accdac9e 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -311,10 +311,10 @@ JS /* Names: $sFileNames */ var form = parent.document.getElementById('Form_EditForm'); - form.getPageFromServer(form.elements.ID.value); parent.statusMessage("{$statusMessage}","{$status}"); $jsErrors parent.document.getElementById('sitetree').getTreeNodeByIdx( "{$folder->ID}" ).getElementsByTagName('a')[0].className += ' contents'; + form.getPageFromServer(form.elements.ID.value); HTML; }