From 2093d5f79a3c92cab13c39dd4e8fa91779629734 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 14 Nov 2010 19:57:50 +0000 Subject: [PATCH] MINOR: call jquery-ui from thirdparty folder instead google api (see ticket 5915) (from r113656) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113696 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/DateField.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forms/DateField.php b/forms/DateField.php index 59a41be52..a01a58df1 100755 --- a/forms/DateField.php +++ b/forms/DateField.php @@ -547,8 +547,9 @@ class DateField_View_JQuery { if($this->getField()->getConfig('showcalendar')) { Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js'); - Requirements::css(Director::protocol().'ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/themes/smoothness/jquery-ui.css'); - Requirements::javascript(Director::protocol().'ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js'); + Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery.ui.all.css'); + 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(); @@ -556,7 +557,7 @@ class DateField_View_JQuery { // TODO Check for existence of locale to avoid unnecessary 404s from the CDN Requirements::javascript( sprintf( - Director::protocol().'ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/i18n/jquery.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 ));