From a836456cd97da539ff1c11ec3de7f124859a7539 Mon Sep 17 00:00:00 2001 From: Julian Seidenberg Date: Thu, 24 Feb 2011 12:07:34 +1300 Subject: [PATCH] BUGFIX: updated links to new jquery ui file paths --- forms/DateField.php | 6 +++--- forms/FileIFrameField.php | 6 +++--- forms/TabSet.php | 8 ++++---- security/Security.php | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/forms/DateField.php b/forms/DateField.php index 2f777562e..08efce744 100755 --- a/forms/DateField.php +++ b/forms/DateField.php @@ -581,8 +581,8 @@ class DateField_View_JQuery { Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js'); Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.datepicker.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.datepicker.js'); // Include language files (if required) $lang = $this->getLang(); @@ -590,7 +590,7 @@ class DateField_View_JQuery { // TODO Check for existence of locale to avoid unnecessary 404s from the CDN Requirements::javascript( sprintf( - THIRDPARTY_DIR . '/jquery-ui/minified/i18n/ui.datepicker-%s.min.js', + THIRDPARTY_DIR . '/jquery-ui/minified/i18n/jquery.ui.datepicker-%s.min.js', // can be a mix between names (e.g. 'de') and combined locales (e.g. 'zh-TW') $lang )); diff --git a/forms/FileIFrameField.php b/forms/FileIFrameField.php index 159a3a7d5..d5782eb4c 100755 --- a/forms/FileIFrameField.php +++ b/forms/FileIFrameField.php @@ -49,11 +49,11 @@ class FileIFrameField extends FileField { * @return string */ public function Field() { - Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.all.css'); + Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/jquery.ui.all.css'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.dialog.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.dialog.js'); if($this->form->getRecord() && $this->form->getRecord()->exists()) { diff --git a/forms/TabSet.php b/forms/TabSet.php index b420d71c2..affe4eef5 100644 --- a/forms/TabSet.php +++ b/forms/TabSet.php @@ -70,12 +70,12 @@ class TabSet extends CompositeField { public function FieldHolder() { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.tabs.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.tabs.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-cookie/jquery.cookie.js'); - Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.all.css'); - Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.tabs.css'); + Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/jquery.ui.all.css'); + Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/jquery.ui.tabs.css'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); diff --git a/security/Security.php b/security/Security.php index 7f8e65d8a..eaa3cb999 100644 --- a/security/Security.php +++ b/security/Security.php @@ -370,13 +370,13 @@ class Security extends Controller { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.tabs.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/jquery.ui.tabs.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js'); - Requirements::css(THIRDPARTY_DIR . '/jquery/themes/smoothness/ui.all.css'); - Requirements::css(THIRDPARTY_DIR . '/jquery/themes/smoothness/ui.tabs.css'); + Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery.ui.all.css'); + Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery.ui.tabs.css'); Requirements::css(SAPPHIRE_DIR . '/css/Security_login.css');