tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +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;

31
javascript/TinyMCEImageEnhancement.js
View File

@ -87,7 +87,7 @@ TinyMCEImageEnhancement.prototype = {
var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes(); var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
var seconds = date.getSeconds() < 10 == 1 ? '0' + date.getSeconds() : date.getSeconds(); var seconds = date.getSeconds() < 10 == 1 ? '0' + date.getSeconds() : date.getSeconds();
var currentDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; var currentDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
var folderName = $('NewFolderName').value; var folderName = $('NewFolderName').value;
this.folderID = folderID; this.folderID = folderID;
var options = { var options = {
method: 'post', method: 'post',
@ -106,7 +106,7 @@ TinyMCEImageEnhancement.prototype = {
onFolderAddSuccess: function(transport) { onFolderAddSuccess: function(transport) {
statusMessage('Creating new folder'); statusMessage('Creating new folder');
$('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').itemTree = null; $('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').itemTree = null;
$('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').setValue(this.folderID); $('TreeDropdownField_Form_EditorToolbarImageForm_FolderID').setValue(this.folderID);
$('NewFolderName').value = ''; $('NewFolderName').value = '';
Element.show('AddFolder'); Element.show('AddFolder');
@ -130,17 +130,17 @@ TinyMCEImageEnhancement.prototype = {
* Called on window.onload * Called on window.onload
*/ */
onWindowLoad: function() { onWindowLoad: function() {
// Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload // Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) { if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
pv = getFlashPlayerVersion(); pv = getFlashPlayerVersion();
if(pv.major < 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) { if(pv.major < 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
$('AddFolderGroup').style.display = 'none'; $('AddFolderGroup').style.display = 'none';
$('PipeSeparator').style.display = 'none'; $('PipeSeparator').style.display = 'none';
$('UploadGroup').style.display = 'none'; $('UploadGroup').style.display = 'none';
return; return;
} }
} }
if($('FolderID') != null) { if($('FolderID') != null) {
this.upload = new Upload( this.upload = new Upload(
@ -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) {
@ -193,13 +194,13 @@ TinyMCEImageEnhancement.prototype = {
} }
//END OF HACK //END OF HACK
$('Image').reapplyBehaviour(); $('Image').reapplyBehaviour();
this.addToTinyMCE = this.addToTinyMCE.bind(this); this.addToTinyMCE = this.addToTinyMCE.bind(this);
/* Don't insert images for now - this inserts the wrong image as images are now sorted by filename rather than date uploaded. /* Don't insert images for now - this inserts the wrong image as images are now sorted by filename rather than date uploaded.
var childNodes = $('Image').childNodes[0].childNodes; var childNodes = $('Image').childNodes[0].childNodes;
var newImages = $A(childNodes).slice(childNodes.length - this.filesUploaded); var newImages = $A(childNodes).slice(childNodes.length - this.filesUploaded);
newImages.each(function(item) { newImages.each(function(item) {
tinyMCEImageEnhancement.addToTinyMCE(item.childNodes[0]); tinyMCEImageEnhancement.addToTinyMCE(item.childNodes[0]);
}); });
*/ */
this.processInProgress = false; this.processInProgress = false;
}, },