mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merged revisions 54959 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2 ........ r54959 | sminnee | 2008-05-22 18:13:24 +1200 (Thu, 22 May 2008) | 1 line Disable / fix flash uploading ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56920 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
e24b1bd498
commit
48f6aad194
@ -6,6 +6,9 @@
|
||||
CMSMain_upload = Class.create();
|
||||
CMSMain_upload.prototype = {
|
||||
initialize: function() {
|
||||
// This is disabled until we get it working reliably
|
||||
return;
|
||||
|
||||
// We require flash 9
|
||||
pv = getFlashPlayerVersion();
|
||||
if(pv.major < 9) return;
|
||||
|
@ -163,6 +163,7 @@ TinyMCEImageEnhancement.prototype = {
|
||||
this.processInProgress = true;
|
||||
this.upload.setFolderID(this.getParentID());
|
||||
$('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload();
|
||||
this.upload.startUpload();
|
||||
},
|
||||
|
||||
uploadFileCompleteCallback: function(file,serverData) {
|
||||
|
Loading…
Reference in New Issue
Block a user