tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 07:59:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX #3740: Fixd duplicate tab highlight in ModelAdmin, by moving back to old tabstrip.js

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75270 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-04-27 07:20:52 +00:00
parent e9f1a7e0c4
commit 7e64e2e7e8
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/ModelAdmin.php
View File

@ -127,8 +127,8 @@ abstract class ModelAdmin extends LeftAndMain {
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/form/jquery.form.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/effen/jquery.fn.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');

14
javascript/ModelAdmin.js
View File

@ -18,19 +18,6 @@ $(document).ready(function() {
$(this).parent().addClass('ajaxActions');
});
/**
* Attach tabs plugin to the set of search filter and edit forms
*/
$('ul.tabstrip').livequery(function() {
$(this).tabs({
// This show handler is necessary to get tabs working properly with the crappy old layout_helpers.js layout
// manager
show : function() {
if(window.onresize) window.onresize();
}
});
});
/*
* Highlight buttons on click
*/
@ -291,6 +278,7 @@ $(document).ready(function() {
}
Behaviour.apply(); // refreshes ComplexTableField
if(window.onresize) window.onresize();
}));
},