diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 43090613..9f91b10f 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -46,16 +46,10 @@ 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"); - - // 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"); - } + Requirements::javascript("jsparty/SWFUpload/SWFUpload.js"); // Include the right JS] // Hayden: This didn't appear to be used at all diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index cc6dbb1d..bc68099c 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -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::javascript('jsparty/SWFUpload/SWFUpload.js'); + Requirements::javascript('cms/javascript/Upload.js'); Requirements::themedCSS('typography');