ENHANCEMENT: including all of jquery-ui instead of specifying individual pieces of it. This is a larger download size, but should be quicker overall as it is just a single download instead of lots of small files.

This commit is contained in:
Julian Seidenberg 2011-02-24 17:07:20 +13:00
parent 1c5f161384
commit 88f67c5859
2 changed files with 5 additions and 15 deletions

View File

@ -213,18 +213,8 @@ class LeftAndMain extends Controller {
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.datepicker.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.dialog.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.tabs.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.draggable.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.droppable.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.accordion.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.effects.core.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.effects.slide.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.effects.drop.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.effects.scale.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery-ui.js'); //import all of jquery ui
Requirements::javascript(CMS_DIR . '/thirdparty/jquery-layout/jquery.layout.js'); Requirements::javascript(CMS_DIR . '/thirdparty/jquery-layout/jquery.layout.js');
Requirements::javascript(CMS_DIR . '/thirdparty/jquery-layout/jquery.layout.state.js'); Requirements::javascript(CMS_DIR . '/thirdparty/jquery-layout/jquery.layout.state.js');
@ -292,6 +282,7 @@ class LeftAndMain extends Controller {
'sapphire/thirdparty/jquery/jquery.js', 'sapphire/thirdparty/jquery/jquery.js',
'sapphire/thirdparty/jquery-livequery/jquery.livequery.js', 'sapphire/thirdparty/jquery-livequery/jquery.livequery.js',
'sapphire/javascript/jquery-ondemand/jquery.ondemand.js', 'sapphire/javascript/jquery-ondemand/jquery.ondemand.js',
'sapphire/thirdparty/jquery-ui/jquery-ui.js',
'sapphire/thirdparty/firebug-lite/firebug.js', 'sapphire/thirdparty/firebug-lite/firebug.js',
'sapphire/thirdparty/firebug-lite/firebugx.js', 'sapphire/thirdparty/firebug-lite/firebugx.js',
'sapphire/javascript/i18n.js', 'sapphire/javascript/i18n.js',

View File

@ -152,8 +152,7 @@ abstract class ModelAdmin extends LeftAndMain {
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-livequery/jquery.livequery.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-livequery/jquery.livequery.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery-ui.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.tabs.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery/jquery_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery/jquery_improvements.js');
Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js'); Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js');
Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.History.js'); Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.History.js');