mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 06:05:56 +00:00
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)
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:
parent
cbe7fe56e2
commit
c2de88f893
@ -135,7 +135,8 @@ JS
|
||||
* Return the form object shown in the uploadiframe.
|
||||
*/
|
||||
function UploadForm() {
|
||||
|
||||
// disabled flash upload javascript (CMSMain_upload()) below,
|
||||
// see r54952 (originally committed in r42014)
|
||||
$form = new Form($this,'UploadForm', new FieldSet(
|
||||
new HiddenField("ID", "", $this->currentPageID()),
|
||||
// needed because the button-action is triggered outside the iframe
|
||||
@ -150,7 +151,7 @@ JS
|
||||
<script>
|
||||
var multi_selector = new MultiSelector($('Form_UploadForm_FilesList'), null, $('Form_UploadForm_action_upload'));
|
||||
multi_selector.addElement($('Form_UploadForm_Files-0'));
|
||||
new window.top.document.CMSMain_upload();
|
||||
//new window.top.document.CMSMain_upload();
|
||||
</script>
|
||||
")
|
||||
), new FieldSet(
|
||||
|
Loading…
x
Reference in New Issue
Block a user