MINOR Removed loader.js dependencies

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92628 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Nov 21, 2009 · 81fe7a2 · 81fe7a2
1 parent b7f0b40
commit 81fe7a2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
@@ -112,7 +112,6 @@ function uploadiframe() {
 		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
@@ -37,7 +37,6 @@ public function index() {
 		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
@@ -209,7 +209,6 @@ function init() {
 		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 @@ function init() {
 		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
@@ -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
@@ -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
@@ -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
@@ -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);