tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merged revisions 54959 via svnmerge from

Browse Source 
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:
Andrew O'Neil 2008-06-25 04:11:58 +00:00
parent e24b1bd498
commit 48f6aad194
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
javascript/CMSMain_upload.js
View File

@ -6,6 +6,9 @@
CMSMain_upload = Class.create(); CMSMain_upload = Class.create();
CMSMain_upload.prototype = { CMSMain_upload.prototype = {
initialize: function() { initialize: function() {
// This is disabled until we get it working reliably
return;
// We require flash 9 // We require flash 9
pv = getFlashPlayerVersion(); pv = getFlashPlayerVersion();
if(pv.major < 9) return; if(pv.major < 9) return;

1
javascript/TinyMCEImageEnhancement.js
View File

@ -163,6 +163,7 @@ TinyMCEImageEnhancement.prototype = {
this.processInProgress = true; this.processInProgress = true;
this.upload.setFolderID(this.getParentID()); this.upload.setFolderID(this.getParentID());
$('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload(); $('UploadFiles').innerHTML = "Uploading ... 1/" + this.upload.getFilesToUpload();
this.upload.startUpload();
}, },
uploadFileCompleteCallback: function(file,serverData) { uploadFileCompleteCallback: function(file,serverData) {