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

MINOR Using Behaviour.register instead of jquery.livequery in TabSet.php/tabstrip.js (already replaced with jQuery.entwine in next release, we try to reduce the dependencies to jquery plugins)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100885 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-03-11 04:37:22 +00:00 committed by Sam Minnee
parent 1b99c6937a
commit 2dffb95e83
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
forms/TabSet.php
View File

@ -55,7 +55,6 @@ class TabSet extends CompositeField {
Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js");
Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css");

1
security/Security.php
View File

@ -348,7 +348,6 @@ class Security extends Controller {
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js");
Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css");

8
thirdparty/tabstrip/tabstrip.js vendored
View File

@ -2,14 +2,16 @@ var _CUR_TABS = [];
var _TABS_ON_PAGE = []; var _TABS_ON_PAGE = [];
var _TAB_DIVS_ON_PAGE = []; var _TAB_DIVS_ON_PAGE = [];
// jQuery loader Behaviour.register({
jQuery('ul.tabstrip').livequery(function() { 'ul.tabstrip': {
initialize: function() {
initTabstrip(this); initTabstrip(this);
if(window.ontabschanged) window.ontabschanged(); if(window.ontabschanged) window.ontabschanged();
}
}
}); });
function initTabstrip(tabstrip, namedAnchors) { function initTabstrip(tabstrip, namedAnchors) {
var i, anchor, container, anchorName, li; var i, anchor, container, anchorName, li;
var childAnchors = tabstrip.getElementsByTagName('a'); var childAnchors = tabstrip.getElementsByTagName('a');
var base, curTab = null, curURL = window.location.href; var base, curTab = null, curURL = window.location.href;