From 48a8213a18790b5d3491c02e0336d1076bf53390 Mon Sep 17 00:00:00 2001 From: jean Date: Wed, 26 Feb 2014 11:17:56 +1300 Subject: [PATCH] BUGFIX Load jquery before leftandmain.js in upload iframe for assets --- code/AssetAdmin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 64e4e88c..d0428665 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -108,11 +108,11 @@ JS Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js"); - Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js"); - Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js"); - Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/jquery/jquery.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); + Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js"); + Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js"); + Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css"); Requirements::css(CMS_DIR . "/css/typography.css"); Requirements::css(CMS_DIR . "/css/layout.css"); Requirements::css(CMS_DIR . "/css/cms_left.css");