Skip to content

Commit

Permalink
Merge branch 'jqsplit'
Browse files Browse the repository at this point in the history 
* jqsplit:
  Restore smoothness.css using update.sh
  allow selecting the preferred CDN and add event
  load jquery via https always
  split off jquery from other JS and add CDN option #1766
  use external version file for jquery updates
  removed jQuery.browser calls
  replace deprecated bind() calls
  replace deprecated delegate() calls
  fixed radio options in media manager for new jQ-UI
  jQuery Updates
  • Loading branch information
@splitbrain
splitbrain committed Feb 3, 2017
2 parents 35284e8 + 727b7c4 commit 65a6bb0
Show file tree
Hide file tree
Showing 94 changed files with 1,816 additions and 28,667 deletions.
1 change: 1 addition & 0 deletions conf/dokuwiki.php
View file
Expand Up @@ -158,6 +158,7 @@

/* Network Settings */
$conf['dnslookups'] = 1; //disable to disallow IP to hostname lookups
$conf['jquerycdn'] = 0; //use a CDN for delivering jQuery?
// Proxy setup - if your Server needs a proxy to access the web set these
$conf['proxy']['host'] = '';
$conf['proxy']['port'] = '';
Expand Down
45 changes: 45 additions & 0 deletions inc/confutils.php
View file
Expand Up @@ -119,6 +119,51 @@ function getInterwiki() {
return $wikis;
}

/**
* Returns the jquery script URLs for the versions defined in lib/scripts/jquery/versions
*
* @trigger CONFUTIL_CDN_SELECT
* @return array
*/
function getCdnUrls() {
global $conf;

// load version info
$versions = array();
$lines = file(DOKU_INC . 'lib/scripts/jquery/versions');
foreach($lines as $line) {
$line = preg_replace('/#.*$/', '', $line);
list($key, $val) = explode('=', $line, 2);
$key = trim($key);
$val = trim($val);
$versions[$key] = $val;
}

$src = array();
$data = array(
'versions' => $versions,
'src' => &$src
);
$event = new Doku_Event('CONFUTIL_CDN_SELECT', $data);
if($event->advise_before()) {
if(!$conf['jquerycdn']) {
$jqmod = md5(join('-', $versions));
$src[] = DOKU_BASE . 'lib/exe/jquery.php' . '?tseed=' . $jqmod;
} elseif($conf['jquerycdn'] == 'jquery') {
$src[] = sprintf('https://code.jquery.com/jquery-%s.min.js', $versions['JQ_VERSION']);
$src[] = sprintf('https://code.jquery.com/jquery-migrate-%s.min.js', $versions['JQM_VERSION']);
$src[] = sprintf('https://code.jquery.com/ui/%s/jquery-ui.min.js', $versions['JQUI_VERSION']);
} elseif($conf['jquerycdn'] == 'cdnjs') {
$src[] = sprintf('https://cdnjs.cloudflare.com/ajax/libs/jquery/%s/jquery.min.js', $versions['JQ_VERSION']);
$src[] = sprintf('https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/%s/jquery-migrate.min.js', $versions['JQM_VERSION']);
$src[] = sprintf('https://cdnjs.cloudflare.com/ajax/libs/jqueryui/%s/jquery-ui.min.js', $versions['JQUI_VERSION']);
}
}
$event->advise_after();

return $src;
}

/**
* returns array of wordblock patterns
*
Expand Down
42 changes: 21 additions & 21 deletions inc/lang/af/jquery.ui.datepicker.js
View file
@@ -1,37 +1,37 @@
/* Afrikaans initialisation for the jQuery UI date picker plugin. */
/* Written by Renier Pretorius. */
(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([ "../datepicker" ], factory );
define( [ "../widgets/datepicker" ], factory );
} else {

// Browser globals
factory( jQuery.datepicker );
}
}(function( datepicker ) {
}( function( datepicker ) {

datepicker.regional['af'] = {
closeText: 'Selekteer',
prevText: 'Vorige',
nextText: 'Volgende',
currentText: 'Vandag',
monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
'Julie','Augustus','September','Oktober','November','Desember'],
monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
weekHeader: 'Wk',
dateFormat: 'dd/mm/yy',
datepicker.regional.af = {
closeText: "Selekteer",
prevText: "Vorige",
nextText: "Volgende",
currentText: "Vandag",
monthNames: [ "Januarie","Februarie","Maart","April","Mei","Junie",
"Julie","Augustus","September","Oktober","November","Desember" ],
monthNamesShort: [ "Jan", "Feb", "Mrt", "Apr", "Mei", "Jun",
"Jul", "Aug", "Sep", "Okt", "Nov", "Des" ],
dayNames: [ "Sondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrydag", "Saterdag" ],
dayNamesShort: [ "Son", "Maa", "Din", "Woe", "Don", "Vry", "Sat" ],
dayNamesMin: [ "So","Ma","Di","Wo","Do","Vr","Sa" ],
weekHeader: "Wk",
dateFormat: "dd/mm/yy",
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
datepicker.setDefaults(datepicker.regional['af']);
yearSuffix: "" };
datepicker.setDefaults( datepicker.regional.af );

return datepicker.regional['af'];
return datepicker.regional.af;

}));
} ) );
43 changes: 22 additions & 21 deletions inc/lang/ar/jquery.ui.datepicker.js
View file
@@ -1,38 +1,39 @@
/* Arabic Translation for jQuery UI date picker plugin. */
/* Used in most of Arab countries, primarily in Bahrain, Kuwait, Oman, Qatar, Saudi Arabia and the United Arab Emirates, Egypt, Sudan and Yemen. */
/* Used in most of Arab countries, primarily in Bahrain, */
/* Kuwait, Oman, Qatar, Saudi Arabia and the United Arab Emirates, Egypt, Sudan and Yemen. */
/* Written by Mohammed Alshehri -- m@dralshehri.com */

(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([ "../datepicker" ], factory );
define( [ "../widgets/datepicker" ], factory );
} else {

// Browser globals
factory( jQuery.datepicker );
}
}(function( datepicker ) {
}( function( datepicker ) {

datepicker.regional['ar'] = {
closeText: 'إغلاق',
prevText: '<السابق',
nextText: 'التالي>',
currentText: 'اليوم',
monthNames: ['يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو',
'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر'],
monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
dayNamesShort: ['أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة', 'سبت'],
dayNamesMin: ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
weekHeader: 'أسبوع',
dateFormat: 'dd/mm/yy',
datepicker.regional.ar = {
closeText: "إغلاق",
prevText: "<السابق",
nextText: "التالي>",
currentText: "اليوم",
monthNames: [ "يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو",
"يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر" ],
monthNamesShort: [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" ],
dayNames: [ "الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت" ],
dayNamesShort: [ "أحد", "اثنين", "ثلاثاء", "أربعاء", "خميس", "جمعة", "سبت" ],
dayNamesMin: [ "ح", "ن", "ث", "ر", "خ", "ج", "س" ],
weekHeader: "أسبوع",
dateFormat: "dd/mm/yy",
firstDay: 0,
isRTL: true,
showMonthAfterYear: false,
yearSuffix: ''};
datepicker.setDefaults(datepicker.regional['ar']);
yearSuffix: "" };
datepicker.setDefaults( datepicker.regional.ar );

return datepicker.regional['ar'];
return datepicker.regional.ar;

}));
} ) );
42 changes: 21 additions & 21 deletions inc/lang/az/jquery.ui.datepicker.js
View file
@@ -1,37 +1,37 @@
/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
/* Written by Jamil Najafov (necefov33@gmail.com). */
(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([ "../datepicker" ], factory );
define( [ "../widgets/datepicker" ], factory );
} else {

// Browser globals
factory( jQuery.datepicker );
}
}(function( datepicker ) {
}( function( datepicker ) {

datepicker.regional['az'] = {
closeText: 'Bağla',
prevText: '<Geri',
nextText: 'İrəli>',
currentText: 'Bugün',
monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
'İyul','Avq','Sen','Okt','Noy','Dek'],
dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
weekHeader: 'Hf',
dateFormat: 'dd.mm.yy',
datepicker.regional.az = {
closeText: "Bağla",
prevText: "<Geri",
nextText: "İrəli>",
currentText: "Bugün",
monthNames: [ "Yanvar","Fevral","Mart","Aprel","May","İyun",
"İyul","Avqust","Sentyabr","Oktyabr","Noyabr","Dekabr" ],
monthNamesShort: [ "Yan","Fev","Mar","Apr","May","İyun",
"İyul","Avq","Sen","Okt","Noy","Dek" ],
dayNames: [ "Bazar","Bazar ertəsi","Çərşənbə axşamı","Çərşənbə","Cümə axşamı","Cümə","Şənbə" ],
dayNamesShort: [ "B","Be","Ça","Ç","Ca","C","Ş" ],
dayNamesMin: [ "B","B","Ç","С","Ç","C","Ş" ],
weekHeader: "Hf",
dateFormat: "dd.mm.yy",
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
datepicker.setDefaults(datepicker.regional['az']);
yearSuffix: "" };
datepicker.setDefaults( datepicker.regional.az );

return datepicker.regional['az'];
return datepicker.regional.az;

}));
} ) );
44 changes: 22 additions & 22 deletions inc/lang/bg/jquery.ui.datepicker.js
View file
@@ -1,38 +1,38 @@
/* Bulgarian initialisation for the jQuery UI date picker plugin. */
/* Written by Stoyan Kyosev (http://svest.org). */
(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([ "../datepicker" ], factory );
define( [ "../widgets/datepicker" ], factory );
} else {

// Browser globals
factory( jQuery.datepicker );
}
}(function( datepicker ) {
}( function( datepicker ) {

datepicker.regional['bg'] = {
closeText: 'затвори',
prevText: '<назад',
nextText: 'напред>',
nextBigText: '>>',
currentText: 'днес',
monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
'Юли','Август','Септември','Октомври','Ноември','Декември'],
monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
'Юли','Авг','Сеп','Окт','Нов','Дек'],
dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
weekHeader: 'Wk',
dateFormat: 'dd.mm.yy',
datepicker.regional.bg = {
closeText: "затвори",
prevText: "<назад",
nextText: "напред>",
nextBigText: ">>",
currentText: "днес",
monthNames: [ "Януари","Февруари","Март","Април","Май","Юни",
"Юли","Август","Септември","Октомври","Ноември","Декември" ],
monthNamesShort: [ "Яну","Фев","Мар","Апр","Май","Юни",
"Юли","Авг","Сеп","Окт","Нов","Дек" ],
dayNames: [ "Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота" ],
dayNamesShort: [ "Нед","Пон","Вто","Сря","Чет","Пет","Съб" ],
dayNamesMin: [ "Не","По","Вт","Ср","Че","Пе","Съ" ],
weekHeader: "Wk",
dateFormat: "dd.mm.yy",
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
datepicker.setDefaults(datepicker.regional['bg']);
yearSuffix: "" };
datepicker.setDefaults( datepicker.regional.bg );

return datepicker.regional['bg'];
return datepicker.regional.bg;

}));
} ) );
42 changes: 21 additions & 21 deletions inc/lang/ca/jquery.ui.datepicker.js
View file
@@ -1,37 +1,37 @@
/* Inicialització en català per a l'extensió 'UI date picker' per jQuery. */
/* Writers: (joan.leon@gmail.com). */
(function( factory ) {
( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define([ "../datepicker" ], factory );
define( [ "../widgets/datepicker" ], factory );
} else {

// Browser globals
factory( jQuery.datepicker );
}
}(function( datepicker ) {
}( function( datepicker ) {

datepicker.regional['ca'] = {
closeText: 'Tanca',
prevText: 'Anterior',
nextText: 'Següent',
currentText: 'Avui',
monthNames: ['gener','febrer','març','abril','maig','juny',
'juliol','agost','setembre','octubre','novembre','desembre'],
monthNamesShort: ['gen','feb','març','abr','maig','juny',
'jul','ag','set','oct','nov','des'],
dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
weekHeader: 'Set',
dateFormat: 'dd/mm/yy',
datepicker.regional.ca = {
closeText: "Tanca",
prevText: "Anterior",
nextText: "Següent",
currentText: "Avui",
monthNames: [ "gener","febrer","març","abril","maig","juny",
"juliol","agost","setembre","octubre","novembre","desembre" ],
monthNamesShort: [ "gen","feb","març","abr","maig","juny",
"jul","ag","set","oct","nov","des" ],
dayNames: [ "diumenge","dilluns","dimarts","dimecres","dijous","divendres","dissabte" ],
dayNamesShort: [ "dg","dl","dt","dc","dj","dv","ds" ],
dayNamesMin: [ "dg","dl","dt","dc","dj","dv","ds" ],
weekHeader: "Set",
dateFormat: "dd/mm/yy",
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
datepicker.setDefaults(datepicker.regional['ca']);
yearSuffix: "" };
datepicker.setDefaults( datepicker.regional.ca );

return datepicker.regional['ca'];
return datepicker.regional.ca;

}));
} ) );

0 comments on commit 65a6bb0

Please sign in to comment.