tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Removed loader.js dependencies

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92628 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 02:37:27 +00:00
parent b7f0b400e7
commit 81fe7a2f10
7 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetAdmin.php
View File

@ -112,7 +112,6 @@ JS
Requirements::clear(); Requirements::clear();
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); 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 . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js");

1
code/ImageEditor.php
View File

@ -37,7 +37,6 @@ class ImageEditor extends Controller {
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js'); Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.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(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js'); Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css'); Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');

2
code/LeftAndMain.php
View File

@ -209,7 +209,6 @@ class LeftAndMain extends Controller {
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-cookie/jquery.cookie.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-cookie/jquery.cookie.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.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(SAPPHIRE_DIR . '/javascript/lang');
Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
@ -270,7 +269,6 @@ class LeftAndMain extends Controller {
Requirements::combine_files( Requirements::combine_files(
'assets/leftandmain.js', 'assets/leftandmain.js',
array( array(
'jsparty/loader.js',
'sapphire/thirdparty/scriptaculous/effects.js', 'sapphire/thirdparty/scriptaculous/effects.js',
'sapphire/thirdparty/scriptaculous/dragdrop.js', 'sapphire/thirdparty/scriptaculous/dragdrop.js',
'sapphire/thirdparty/scriptaculous/controls.js', 'sapphire/thirdparty/scriptaculous/controls.js',

6
javascript/AssetAdmin.js
View File

@ -354,7 +354,7 @@ deletefolder = {
deletefolder.o1 = $('sitetree').observeMethod('SelectionChanged', deletefolder.treeSelectionChanged); deletefolder.o1 = $('sitetree').observeMethod('SelectionChanged', deletefolder.treeSelectionChanged);
deletefolder.o2 = $('Form_DeleteItemsForm').observeMethod('Close', deletefolder.popupClosed); deletefolder.o2 = $('Form_DeleteItemsForm').observeMethod('Close', deletefolder.popupClosed);
addClass($('sitetree'),'multiselect'); jQuery('#sitetree').addClass('multiselect');
deletefolder.selectedNodes = { }; deletefolder.selectedNodes = { };
@ -387,7 +387,7 @@ deletefolder = {
}, },
popupClosed : function() { popupClosed : function() {
removeClass($('sitetree'),'multiselect'); jQuery('#sitetree').removeClass('multiselect');
$('sitetree').stopObserving(deletefolder.o1); $('sitetree').stopObserving(deletefolder.o1);
$('Form_DeleteItemsForm').stopObserving(deletefolder.o2); $('Form_DeleteItemsForm').stopObserving(deletefolder.o2);
@ -489,7 +489,7 @@ Behaviour.register({
/** /**
* Initialisation function to set everything up * Initialisation function to set everything up
*/ */
appendLoader(function () { jQuery(document).ready(function() {
// Set up delete page // Set up delete page
Observable.applyTo($('Form_DeleteItemsForm')); Observable.applyTo($('Form_DeleteItemsForm'));
if($('deletepage')) { if($('deletepage')) {

4
javascript/CMSMain_left.js
View File

@ -189,7 +189,7 @@ batchactionsclass.prototype = {
batchActionGlobals.o1 = $('sitetree').observeMethod('SelectionChanged', batchActionGlobals.treeSelectionChanged); batchActionGlobals.o1 = $('sitetree').observeMethod('SelectionChanged', batchActionGlobals.treeSelectionChanged);
batchActionGlobals.o2 = $(_HANDLER_FORMS.batchactions).observeMethod('Close', batchActionGlobals.popupClosed); batchActionGlobals.o2 = $(_HANDLER_FORMS.batchactions).observeMethod('Close', batchActionGlobals.popupClosed);
addClass($('sitetree'),'multiselect'); jQuery('#sitetree').addClass('multiselect');
batchActionGlobals.selectedNodes = { }; batchActionGlobals.selectedNodes = { };
@ -250,7 +250,7 @@ batchActionGlobals = {
}, },
popupClosed : function() { popupClosed : function() {
removeClass($('sitetree'),'multiselect'); jQuery('#sitetree').removeClass('multiselect');
$('sitetree').stopObserving(batchActionGlobals.o1); $('sitetree').stopObserving(batchActionGlobals.o1);
$(_HANDLER_FORMS.batchactions).stopObserving(batchActionGlobals.o2); $(_HANDLER_FORMS.batchactions).stopObserving(batchActionGlobals.o2);

2
javascript/ReportAdmin_left.js
View File

@ -47,7 +47,7 @@ function reloadSiteTree() {
}); });
} }
appendLoader(function () { jQuery(document).ready(function() {
if($('sitetree')) { if($('sitetree')) {
var selectedNode = $('sitetree').getElementsByTagName('li')[1]; var selectedNode = $('sitetree').getElementsByTagName('li')[1];
selectedNode.onselect(); selectedNode.onselect();

4
javascript/SecurityAdmin_left.js
View File

@ -50,7 +50,7 @@ var deletegroup = {
deletegroup.o1 = $('sitetree').observeMethod('SelectionChanged', deletegroup.treeSelectionChanged); deletegroup.o1 = $('sitetree').observeMethod('SelectionChanged', deletegroup.treeSelectionChanged);
deletegroup.o2 = $('deletegroup_options').observeMethod('Close', deletegroup.popupClosed); deletegroup.o2 = $('deletegroup_options').observeMethod('Close', deletegroup.popupClosed);
addClass($('sitetree'),'multiselect'); jQuery('#sitetree').addClass('multiselect');
deletegroup.selectedNodes = { }; deletegroup.selectedNodes = { };
@ -87,7 +87,7 @@ var deletegroup = {
}, },
popupClosed : function() { popupClosed : function() {
removeClass($('sitetree'),'multiselect'); jQuery('#sitetree').removeClass('multiselect');
$('sitetree').stopObserving(deletegroup.o1); $('sitetree').stopObserving(deletegroup.o1);
$('deletegroup_options').stopObserving(deletegroup.o2); $('deletegroup_options').stopObserving(deletegroup.o2);