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

Revert r44795 (merged from branches/2.2.0, r44812)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-11-15 22:30:25 +00:00
parent 58c39593b3
commit d44ef49db6
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/AssetAdmin.php
View File

@ -46,10 +46,16 @@ class AssetAdmin extends LeftAndMain {
Requirements::javascript("cms/javascript/AssetAdmin_left.js");
Requirements::javascript("cms/javascript/AssetAdmin_right.js");
Requirements::javascript("cms/javascript/CMSMain_upload.js");
Requirements::javascript("cms/javascript/Upload.js");
Requirements::javascript("sapphire/javascript/Security_login.js");
Requirements::javascript("jsparty/swfupload/swfupload.js");
// We don't want SWFUpload on linux, since it doesn't work
$browscap = new Browscap();
$hitdata = $browscap->getBrowser(null, true);
if(!($hitdata['Platform'] && stristr($hitdata['Platform'], 'linux'))) {
Requirements::javascript("cms/javascript/CMSMain_upload.js");
Requirements::javascript("cms/javascript/Upload.js");
Requirements::javascript("jsparty/SWFUpload/SWFUpload.js");
}
// Include the right JS]
// Hayden: This didn't appear to be used at all

14
code/LeftAndMain.php
View File

@ -81,9 +81,6 @@ abstract class LeftAndMain extends Controller {
Requirements::javascript('jsparty/tabstrip/tabstrip.js');
Requirements::css('jsparty/tabstrip/tabstrip.css');
Requirements::css('cms/css/TinyMCEImageEnhancement.css');
Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js');
Requirements::javascript('cms/javascript/LeftAndMain.js');
Requirements::javascript('cms/javascript/LeftAndMain_left.js');
Requirements::javascript('cms/javascript/LeftAndMain_right.js');
@ -131,8 +128,15 @@ abstract class LeftAndMain extends Controller {
Requirements::javascript('sapphire/javascript/SelectionGroup.js');
Requirements::css('sapphire/css/SelectionGroup.css');
Requirements::javascript('jsparty/swfupload/swfupload.js');
Requirements::javascript('cms/javascript/Upload.js');
// We don't want SWFUpload on linux, since it doesn't work
$browscap = new Browscap();
$hitdata = $browscap->getBrowser(null, true);
if(!($hitdata['Platform'] && stristr($hitdata['Platform'], 'linux'))) {
Requirements::css('cms/css/TinyMCEImageEnhancement.css');
Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js');
Requirements::javascript('jsparty/SWFUpload/SWFUpload.js');
Requirements::javascript('cms/javascript/Upload.js');
}
Requirements::themedCSS('typography');

2
code/StatisticsAdmin.php
View File

@ -51,7 +51,7 @@ class StatisticsAdmin extends LeftAndMain {
Requirements::css("sapphire/css/SubmittedFormReportField.css");
Requirements::css('cms/css/TinyMCEImageEnhancement.css');
Requirements::javascript("jsparty/swfupload/swfupload.js");
Requirements::javascript("jsparty/SWFUpload/SWFUpload.js");
Requirements::javascript("cms/javascript/Upload.js");
Requirements::javascript("sapphire/javascript/Security_login.js");
Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js');

6
javascript/Upload.js
View File

@ -60,8 +60,8 @@ Upload.prototype = {
file_validation_handler : Prototype.emptyFunction,
file_cancelled_handler: Prototype.emptyFunction,
flash_url : 'jsparty/swfupload/swfupload.swf', // Relative to this file
swfupload_loaded_handler: this.buildUI.bind(this),
flash_url : 'jsparty/SWFUpload/SWFUpload.swf', // Relative to this file
ui_function: this.buildUI.bind(this),
debug: false
});
},
@ -209,7 +209,7 @@ Upload.prototype = {
*/
browse: function() {
this.swfu.selectFiles();
this.swfu.browse();
},
/**