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: call jquery-ui from thirdparty folder instead google api (see ticket 5915)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@113656 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Carlos Barberis 2010-11-11 04:45:31 +00:00
parent ea631824e0
commit bf8afd6cac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
forms/DateField.php
View File

@ -547,8 +547,9 @@ class DateField_View_JQuery {
if($this->getField()->getConfig('showcalendar')) { if($this->getField()->getConfig('showcalendar')) {
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::css('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/themes/smoothness/jquery-ui.css'); Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
Requirements::javascript('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.datepicker.js');
// Include language files (if required) // Include language files (if required)
$lang = $this->getLang(); $lang = $this->getLang();
@ -556,7 +557,7 @@ class DateField_View_JQuery {
// TODO Check for existence of locale to avoid unnecessary 404s from the CDN // TODO Check for existence of locale to avoid unnecessary 404s from the CDN
Requirements::javascript( Requirements::javascript(
sprintf( sprintf(
'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/i18n/jquery.ui.datepicker-%s.min.js', THIRDPARTY_DIR . '/jquery-ui/minified/i18n/ui.datepicker-%s.min.js',
// can be a mix between names (e.g. 'de') and combined locales (e.g. 'zh-TW') // can be a mix between names (e.g. 'de') and combined locales (e.g. 'zh-TW')
$lang $lang
)); ));