From 81fe7a2f10c82db4ac6559842d034d3f3f5626de Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 02:37:27 +0000 Subject: [PATCH] MINOR Removed loader.js dependencies git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92628 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 1 - code/ImageEditor.php | 1 - code/LeftAndMain.php | 2 -- javascript/AssetAdmin.js | 6 +++--- javascript/CMSMain_left.js | 4 ++-- javascript/ReportAdmin_left.js | 2 +- javascript/SecurityAdmin_left.js | 4 ++-- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index fc6392fc..1ef3a4d0 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -112,7 +112,6 @@ JS Requirements::clear(); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); diff --git a/code/ImageEditor.php b/code/ImageEditor.php index d67bee4f..2709ae8f 100644 --- a/code/ImageEditor.php +++ b/code/ImageEditor.php @@ -37,7 +37,6 @@ class ImageEditor extends Controller { Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js'); Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js'); - Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js'); Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css'); diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index d39a373a..0ef67938 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -209,7 +209,6 @@ class LeftAndMain extends Controller { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-cookie/jquery.cookie.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); - Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang'); @@ -270,7 +269,6 @@ class LeftAndMain extends Controller { Requirements::combine_files( 'assets/leftandmain.js', array( - 'jsparty/loader.js', 'sapphire/thirdparty/scriptaculous/effects.js', 'sapphire/thirdparty/scriptaculous/dragdrop.js', 'sapphire/thirdparty/scriptaculous/controls.js', diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js index f5a81fa3..426c6947 100755 --- a/javascript/AssetAdmin.js +++ b/javascript/AssetAdmin.js @@ -354,7 +354,7 @@ deletefolder = { deletefolder.o1 = $('sitetree').observeMethod('SelectionChanged', deletefolder.treeSelectionChanged); deletefolder.o2 = $('Form_DeleteItemsForm').observeMethod('Close', deletefolder.popupClosed); - addClass($('sitetree'),'multiselect'); + jQuery('#sitetree').addClass('multiselect'); deletefolder.selectedNodes = { }; @@ -387,7 +387,7 @@ deletefolder = { }, popupClosed : function() { - removeClass($('sitetree'),'multiselect'); + jQuery('#sitetree').removeClass('multiselect'); $('sitetree').stopObserving(deletefolder.o1); $('Form_DeleteItemsForm').stopObserving(deletefolder.o2); @@ -489,7 +489,7 @@ Behaviour.register({ /** * Initialisation function to set everything up */ -appendLoader(function () { +jQuery(document).ready(function() { // Set up delete page Observable.applyTo($('Form_DeleteItemsForm')); if($('deletepage')) { diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js index 048d0f68..8175094d 100755 --- a/javascript/CMSMain_left.js +++ b/javascript/CMSMain_left.js @@ -189,7 +189,7 @@ batchactionsclass.prototype = { batchActionGlobals.o1 = $('sitetree').observeMethod('SelectionChanged', batchActionGlobals.treeSelectionChanged); batchActionGlobals.o2 = $(_HANDLER_FORMS.batchactions).observeMethod('Close', batchActionGlobals.popupClosed); - addClass($('sitetree'),'multiselect'); + jQuery('#sitetree').addClass('multiselect'); batchActionGlobals.selectedNodes = { }; @@ -250,7 +250,7 @@ batchActionGlobals = { }, popupClosed : function() { - removeClass($('sitetree'),'multiselect'); + jQuery('#sitetree').removeClass('multiselect'); $('sitetree').stopObserving(batchActionGlobals.o1); $(_HANDLER_FORMS.batchactions).stopObserving(batchActionGlobals.o2); diff --git a/javascript/ReportAdmin_left.js b/javascript/ReportAdmin_left.js index 2664ac0e..0ffd7634 100755 --- a/javascript/ReportAdmin_left.js +++ b/javascript/ReportAdmin_left.js @@ -47,7 +47,7 @@ function reloadSiteTree() { }); } -appendLoader(function () { +jQuery(document).ready(function() { if($('sitetree')) { var selectedNode = $('sitetree').getElementsByTagName('li')[1]; selectedNode.onselect(); diff --git a/javascript/SecurityAdmin_left.js b/javascript/SecurityAdmin_left.js index 3655b397..c0369286 100755 --- a/javascript/SecurityAdmin_left.js +++ b/javascript/SecurityAdmin_left.js @@ -50,7 +50,7 @@ var deletegroup = { deletegroup.o1 = $('sitetree').observeMethod('SelectionChanged', deletegroup.treeSelectionChanged); deletegroup.o2 = $('deletegroup_options').observeMethod('Close', deletegroup.popupClosed); - addClass($('sitetree'),'multiselect'); + jQuery('#sitetree').addClass('multiselect'); deletegroup.selectedNodes = { }; @@ -87,7 +87,7 @@ var deletegroup = { }, popupClosed : function() { - removeClass($('sitetree'),'multiselect'); + jQuery('#sitetree').removeClass('multiselect'); $('sitetree').stopObserving(deletegroup.o1); $('deletegroup_options').stopObserving(deletegroup.o2);