Merge pull request #788 from splitbrain/jquery

  update jquery and jquery-ui

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/ja/jquery.ui.datepicker.js b/inc/lang/ja/jquery.ui.datepicker.js
index 4d0b63c77..381f41b5d 100644
--- a/inc/lang/ja/jquery.ui.datepicker.js
+++ b/inc/lang/ja/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Japanese initialisation for the jQuery UI date picker plugin. */
 /* Written by Kentaro SATO (kentaro@ranvis.com). */
-jQuery(function($){
-	$.datepicker.regional['ja'] = {
-		closeText: '閉じる',
-		prevText: '<前',
-		nextText: '次>',
-		currentText: '今日',
-		monthNames: ['1月','2月','3月','4月','5月','6月',
-		'7月','8月','9月','10月','11月','12月'],
-		monthNamesShort: ['1月','2月','3月','4月','5月','6月',
-		'7月','8月','9月','10月','11月','12月'],
-		dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
-		dayNamesShort: ['日','月','火','水','木','金','土'],
-		dayNamesMin: ['日','月','火','水','木','金','土'],
-		weekHeader: '週',
-		dateFormat: 'yy/mm/dd',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '年'};
-	$.datepicker.setDefaults($.datepicker.regional['ja']);
-});
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "../datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+}(function( datepicker ) {
+
+datepicker.regional['ja'] = {
+	closeText: '閉じる',
+	prevText: '<前',
+	nextText: '次>',
+	currentText: '今日',
+	monthNames: ['1月','2月','3月','4月','5月','6月',
+	'7月','8月','9月','10月','11月','12月'],
+	monthNamesShort: ['1月','2月','3月','4月','5月','6月',
+	'7月','8月','9月','10月','11月','12月'],
+	dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
+	dayNamesShort: ['日','月','火','水','木','金','土'],
+	dayNamesMin: ['日','月','火','水','木','金','土'],
+	weekHeader: '週',
+	dateFormat: 'yy/mm/dd',
+	firstDay: 0,
+	isRTL: false,
+	showMonthAfterYear: true,
+	yearSuffix: '年'};
+datepicker.setDefaults(datepicker.regional['ja']);
+
+return datepicker.regional['ja'];
+
+}));