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

SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813)

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

8
code/AssetAdmin.php
View File

@ -46,16 +46,10 @@ class AssetAdmin extends LeftAndMain {
Requirements::javascript("cms/javascript/AssetAdmin_left.js");
Requirements::javascript("cms/javascript/AssetAdmin_right.js");
Requirements::javascript("sapphire/javascript/Security_login.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("sapphire/javascript/Security_login.js");
Requirements::javascript("jsparty/SWFUpload/SWFUpload.js");
}
// Include the right JS]
// Hayden: This didn't appear to be used at all

10
code/LeftAndMain.php
View File

@ -81,6 +81,9 @@ 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');
@ -128,15 +131,8 @@ abstract class LeftAndMain extends Controller {
Requirements::javascript('sapphire/javascript/SelectionGroup.js');
Requirements::css('sapphire/css/SelectionGroup.css');
// 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');