diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php index b822f7003..e01131841 100755 --- a/forms/ComplexTableField.php +++ b/forms/ComplexTableField.php @@ -943,7 +943,6 @@ class ComplexTableField_Popup extends Form { * Some have special requirements. */ //Requirements::css(CMS_DIR . '/css/layout.css'); - Requirements::css(THIRDPARTY_DIR . '/tabstrip/tabstrip.css'); Requirements::css(SAPPHIRE_DIR . '/css/Form.css'); Requirements::css(SAPPHIRE_DIR . '/css/ComplexTableField_popup.css'); Requirements::css(CMS_DIR . '/css/typography.css'); @@ -951,8 +950,6 @@ class ComplexTableField_Popup extends Form { Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); diff --git a/forms/ScaffoldingComplexTableField.php b/forms/ScaffoldingComplexTableField.php index 429d867d2..fa324f506 100644 --- a/forms/ScaffoldingComplexTableField.php +++ b/forms/ScaffoldingComplexTableField.php @@ -21,7 +21,6 @@ class ScaffoldingComplexTableField_Popup extends Form { * Some have special requirements. */ //Requirements::css(CMS_DIR . 'css/layout.css'); - Requirements::css(THIRDPARTY_DIR . '/tabstrip/tabstrip.css'); Requirements::css(SAPPHIRE_DIR . '/css/Form.css'); Requirements::css(SAPPHIRE_DIR . '/css/ComplexTableField_popup.css'); Requirements::css(CMS_DIR . '/css/typography.css'); @@ -30,8 +29,6 @@ class ScaffoldingComplexTableField_Popup extends Form { Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); diff --git a/forms/TabSet.php b/forms/TabSet.php index 1df0c3df6..5b546eb83 100644 --- a/forms/TabSet.php +++ b/forms/TabSet.php @@ -53,6 +53,8 @@ class TabSet extends CompositeField { Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); + Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); diff --git a/security/Member.php b/security/Member.php index 99e68a030..fceb0c7b8 100644 --- a/security/Member.php +++ b/security/Member.php @@ -1177,14 +1177,11 @@ class Member_ProfileForm extends Form { function __construct($controller, $name, $member) { Requirements::clear(); - Requirements::css(THIRDPARTY_DIR . '/tabstrip/tabstrip.css'); Requirements::css(CMS_DIR . '/css/typography.css'); Requirements::css(CMS_DIR . '/css/cms_right.css'); Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); diff --git a/security/Security.php b/security/Security.php index 82d263cb4..04ec1fae4 100644 --- a/security/Security.php +++ b/security/Security.php @@ -308,9 +308,7 @@ class Security extends Controller { Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/effects.js"); - Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); Requirements::css(SAPPHIRE_DIR . "/css/Form.css"); // Needed because the in the template makes problems