Permalink
Browse files

BUGFIX AssetAdmin->doUpload() shows JS alert *before* triggering a pa…

…ge 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
  • Loading branch information...
1 parent 7325d32 commit dd70fcd5be86768b982a190b495e6a0298868df0 @chillu chillu committed with sminnee Jul 19, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 code/AssetAdmin.php
View
@@ -311,10 +311,10 @@ function doUpload($data, $form) {
/* 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);
</script>
HTML;
}

0 comments on commit dd70fcd

Please sign in to comment.