From: Felix Nagel Date: Wed, 7 Oct 2015 22:38:07 +0000 (+0200) Subject: Merge branch 'master' into datepicker X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e8b7234b214f9ee363f4f85ad4a24c4a269baba;p=jquery-ui.git Merge branch 'master' into datepicker --- 7e8b7234b214f9ee363f4f85ad4a24c4a269baba diff --cc demos/bootstrap.js index faffcbdd8,7a942374d..efac1b838 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@@ -70,11 -76,8 +77,11 @@@ function fixPaths( modules ) document.documentElement.className = "demo-loading"; require.config( { - baseUrl: "../../ui", + baseUrl: window.location.pathname.indexOf( "demos/" ) !== -1 ? "../../ui" : "../../../ui", paths: { + cldr: "../external/cldrjs/cldr", + globalize: "../external/globalize/globalize", + "globalize-locales": "../external/localization", jquery: "../external/jquery/jquery", external: "../external/" }, diff --cc demos/calendar/buttonbar.html index 9acd89bdd,000000000..28ee693cc mode 100644,000000..100644 --- a/demos/calendar/buttonbar.html +++ b/demos/calendar/buttonbar.html @@@ -1,27 -1,0 +1,28 @@@ + + + + ++ + jQuery UI Calendar - Display button bar + + + + + + + +
+ +
+

Display a button for selecting Today's date with the buttons option.

+
+ + diff --cc demos/calendar/default.html index 9be0f1988,000000000..1a2cfdf77 mode 100644,000000..100644 --- a/demos/calendar/default.html +++ b/demos/calendar/default.html @@@ -1,21 -1,0 +1,22 @@@ + + + + ++ + jQuery UI Calendar - Default functionality + + + + + + + +
+ +
+

The calendar is a widget for selecting a date using a visual calendar representation.

+
+ + diff --cc demos/calendar/dropdown-month-year.html index 3aacaef47,000000000..92b7e24fb mode 100644,000000..100644 --- a/demos/calendar/dropdown-month-year.html +++ b/demos/calendar/dropdown-month-year.html @@@ -1,24 -1,0 +1,25 @@@ + + + + ++ + jQuery UI Calendar - Display month & year menus + + + + + + + +
+ +
+

Show month and year dropdowns in place of the static month/year header to facilitate navigation through large timeframes. Add the boolean changeMonth and changeYear options.

+
+ + diff --cc demos/calendar/localization.html index df50ca2c9,000000000..dfd8b1f1e mode 100644,000000..100644 --- a/demos/calendar/localization.html +++ b/demos/calendar/localization.html @@@ -1,41 -1,0 +1,41 @@@ + + + + ++ + jQuery UI Calendar - Localize calendar + - + + + + + + +
+ + +
+

Localize the calendar language and format (English / Western formatting is the default). The calendar includes built-in support for languages that read right-to-left, such as Arabic and Hebrew.

+
+ + diff --cc demos/calendar/min-max.html index d4b074a5e,000000000..b3036b873 mode 100644,000000..100644 --- a/demos/calendar/min-max.html +++ b/demos/calendar/min-max.html @@@ -1,28 -1,0 +1,33 @@@ + + + + + jQuery UI Calendar - Restrict date range + + + + + + + +
+ +
+

Restrict the range of selectable dates with the min and max options. Set the beginning and end dates as actual dates (new Date(2009, 1 - 1, 26)).

+
+ + diff --cc demos/calendar/multiple-months.html index 3bde416c0,000000000..f83da1f82 mode 100644,000000..100644 --- a/demos/calendar/multiple-months.html +++ b/demos/calendar/multiple-months.html @@@ -1,23 -1,0 +1,24 @@@ + + + + ++ + jQuery UI Calendar - Display multiple months + + + + + + + +
+ +
+

Set the numberOfMonths option to an integer of 2 or more to show multiple months in a single calendar.

+
+ + diff --cc demos/calendar/other-months.html index ac8df8d3a,000000000..2fb4dacf8 mode 100644,000000..100644 --- a/demos/calendar/other-months.html +++ b/demos/calendar/other-months.html @@@ -1,30 -1,0 +1,31 @@@ + + + + ++ + jQuery UI Calendar - Dates in other months + + + + + + + +
+ +
+

The calendar can show dates that come from other than the main month + being displayed. These other dates can also be made selectable.

+
+ + diff --cc demos/calendar/show-week.html index 96f3c7da2,000000000..e148b6570 mode 100644,000000..100644 --- a/demos/calendar/show-week.html +++ b/demos/calendar/show-week.html @@@ -1,25 -1,0 +1,26 @@@ + + + + ++ + jQuery UI Calendar - Show week of the year + + + + + + + +
+ +
+

The calendar can show the week of the year. The calculation follows + Unicode CLDR specification. + This means that some days from one year may be placed into weeks 'belonging' to another year.

+
+ + diff --cc tests/lib/bootstrap.js index 89c4d4893,2fe2edd1b..745ddefb1 --- a/tests/lib/bootstrap.js +++ b/tests/lib/bootstrap.js @@@ -1,12 -1,9 +1,12 @@@ ( function() { - requirejs.config({ + requirejs.config( { paths: { + "cldr": "../../../external/cldrjs/cldr", "globalize": "../../../external/globalize/globalize", - "globalize/ja-JP": "../../../external/globalize/globalize.culture.ja-JP", + "globalize-locales": "../../../external/localization", + "globalize-old": "../../../external/globalize-old/globalize", + "globalize-old/ja-JP": "../../../external/globalize-old/globalize.culture.ja-JP", "jquery": jqueryUrl(), "jquery-simulate": "../../../external/jquery-simulate/jquery.simulate", "jshint": "../../../external/jshint/jshint",