tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed js error due to inlined inclusion of CMSMain_upload.js which was conflicting with inline initialization. Disabled initializiation as the flash uploader was pulled out a while ago anyway (see #3251)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69657 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-01-05 01:41:32 +00:00 committed by Sam Minnee
parent cbe7fe56e2
commit c2de88f893
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/AssetAdmin.php
View File

@ -135,7 +135,8 @@ JS
* Return the form object shown in the uploadiframe. * Return the form object shown in the uploadiframe.
*/ */
function UploadForm() { function UploadForm() {
// disabled flash upload javascript (CMSMain_upload()) below,
// see r54952 (originally committed in r42014)
$form = new Form($this,'UploadForm', new FieldSet( $form = new Form($this,'UploadForm', new FieldSet(
new HiddenField("ID", "", $this->currentPageID()), new HiddenField("ID", "", $this->currentPageID()),
// needed because the button-action is triggered outside the iframe // needed because the button-action is triggered outside the iframe
@ -150,7 +151,7 @@ JS
<script> <script>
var multi_selector = new MultiSelector($('Form_UploadForm_FilesList'), null, $('Form_UploadForm_action_upload')); var multi_selector = new MultiSelector($('Form_UploadForm_FilesList'), null, $('Form_UploadForm_action_upload'));
multi_selector.addElement($('Form_UploadForm_Files-0')); multi_selector.addElement($('Form_UploadForm_Files-0'));
new window.top.document.CMSMain_upload(); //new window.top.document.CMSMain_upload();
</script> </script>
") ")
), new FieldSet( ), new FieldSet(