diff --git a/Gruntfile.js b/Gruntfile.js
index 6a711962b82..3d9a11963db 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,6 +28,7 @@ var
"core",
"accordion",
"autocomplete",
+ "calendar",
"button",
"datepicker",
"dialog",
@@ -174,7 +175,7 @@ grunt.initConfig({
},
qunit: {
files: expandFiles( "tests/unit/" + component + "/*.html" ).filter(function( file ) {
- return !( /(all|index|test)\.html$/ ).test( file );
+ return !( /(all|index|test|datepicker)\.html$/ ).test( file );
}),
options: {
page: {
diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index a147b8f573c..0d500ef09dd 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -14,6 +14,7 @@ var versions = {
"Accordion": "accordion/accordion.html",
"Autocomplete": "autocomplete/autocomplete.html",
"Button": "button/button.html",
+ "Calendar": "calendar/calendar.html",
"Core": "core/core.html",
"Core_deprecated": "core/core_deprecated.html",
"Datepicker": "datepicker/datepicker.html",
diff --git a/demos/calendar/buttonbar.html b/demos/calendar/buttonbar.html
new file mode 100644
index 00000000000..7ed390b25d1
--- /dev/null
+++ b/demos/calendar/buttonbar.html
@@ -0,0 +1,37 @@
+
+
+
+
+ jQuery UI Calendar - Display button bar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Display a button for selecting Today's date with the buttons
option.
+
+
+
diff --git a/demos/calendar/default.html b/demos/calendar/default.html
new file mode 100644
index 00000000000..a67c2d7028f
--- /dev/null
+++ b/demos/calendar/default.html
@@ -0,0 +1,31 @@
+
+
+
+
+ jQuery UI Calendar - Default functionality
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
The calendar is a widget for selecting a date using a visual calendar representation.
+
+
+
diff --git a/demos/datepicker/dropdown-month-year.html b/demos/calendar/dropdown-month-year.html
similarity index 61%
rename from demos/datepicker/dropdown-month-year.html
rename to demos/calendar/dropdown-month-year.html
index 8668018d96e..050a89157ff 100644
--- a/demos/datepicker/dropdown-month-year.html
+++ b/demos/calendar/dropdown-month-year.html
@@ -2,16 +2,21 @@
- jQuery UI Datepicker - Display month & year menus
+ jQuery UI Calendar - Display month & year menus
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ German (Deutsch)
+ English
+
+
+
+
Localize the calendar 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 --git a/demos/calendar/min-max.html b/demos/calendar/min-max.html
new file mode 100644
index 00000000000..d813c5071b2
--- /dev/null
+++ b/demos/calendar/min-max.html
@@ -0,0 +1,38 @@
+
+
+
+
+ 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 --git a/demos/datepicker/multiple-calendars.html b/demos/calendar/multiple-calendars.html
similarity index 52%
rename from demos/datepicker/multiple-calendars.html
rename to demos/calendar/multiple-calendars.html
index 716b6c68ef6..f67609d143e 100644
--- a/demos/datepicker/multiple-calendars.html
+++ b/demos/calendar/multiple-calendars.html
@@ -2,16 +2,21 @@
- jQuery UI Datepicker - Display multiple months
+ 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 --git a/demos/calendar/other-months.html b/demos/calendar/other-months.html
new file mode 100644
index 00000000000..0228c62df5b
--- /dev/null
+++ b/demos/calendar/other-months.html
@@ -0,0 +1,40 @@
+
+
+
+
+ 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 --git a/demos/calendar/show-week.html b/demos/calendar/show-week.html
new file mode 100644
index 00000000000..08687aa0dea
--- /dev/null
+++ b/demos/calendar/show-week.html
@@ -0,0 +1,35 @@
+
+
+
+
+ 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 --git a/demos/datepicker/alt-field.html b/demos/datepicker/alt-field.html
index 7e3b50a6de9..3ea5d1f18f1 100644
--- a/demos/datepicker/alt-field.html
+++ b/demos/datepicker/alt-field.html
@@ -5,15 +5,23 @@
jQuery UI Datepicker - Populate alternate field
+
+
+
+
+
+
diff --git a/demos/datepicker/animation.html b/demos/datepicker/animation.html
index 990fd6262e3..6fbc31ff92e 100644
--- a/demos/datepicker/animation.html
+++ b/demos/datepicker/animation.html
@@ -5,6 +5,9 @@
jQuery UI Datepicker - Animations
+
+
+
@@ -14,13 +17,20 @@
+
+
+
@@ -31,16 +41,15 @@
Animations:
- Show (default)
- Slide down
- Fade in
+ Fade in/out (default)
+ Slide down/up
Blind (UI Effect)
Bounce (UI Effect)
Clip (UI Effect)
Drop (UI Effect)
Fold (UI Effect)
Slide (UI Effect)
- None
+ None
diff --git a/demos/datepicker/buttonbar.html b/demos/datepicker/buttonbar.html
deleted file mode 100644
index 040ec1112ec..00000000000
--- a/demos/datepicker/buttonbar.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- jQuery UI Datepicker - Display button bar
-
-
-
-
-
-
-
-
-
-
-Date:
-
-
-
Display a button for selecting Today's date and a Done button for closing the calendar with the boolean showButtonPanel
option. Each button is enabled by default when the bar is displayed, but can be turned off with additional options. Button text is customizable.
-
-
-
diff --git a/demos/datepicker/date-formats.html b/demos/datepicker/date-formats.html
index 39be9aa1522..97ef529a609 100644
--- a/demos/datepicker/date-formats.html
+++ b/demos/datepicker/date-formats.html
@@ -5,15 +5,32 @@
jQuery UI Datepicker - Format date
+
+
+
+
+
+
@@ -24,12 +41,9 @@
Format options:
- Default - mm/dd/yy
- ISO 8601 - yy-mm-dd
- Short - d M, y
- Medium - d MM, y
- Full - DD, d MM, yy
- With text - 'day' d 'of' MM 'in the year' yy
+ Short - M/d/yy in "en" locale
+ Long - MMMM d, y in "en" locale
+ ISO 8601 - yyyy-MM-dd
diff --git a/demos/datepicker/date-range.html b/demos/datepicker/date-range.html
deleted file mode 100644
index 34c64a9b2e0..00000000000
--- a/demos/datepicker/date-range.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- jQuery UI Datepicker - Select a Date Range
-
-
-
-
-
-
-
-
-
-
-From
-
-to
-
-
-
-
Select the date range to search for.
-
-
-
diff --git a/demos/datepicker/datepicker-ar.js b/demos/datepicker/datepicker-ar.js
deleted file mode 100644
index fc6d2a883c0..00000000000
--- a/demos/datepicker/datepicker-ar.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Alhourani -- me@khaledalhourani.com */
-/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
-(function( factory ) {
- if ( typeof define === "function" && define.amd ) {
-
- // AMD. Register as an anonymous module.
- define([ "../jquery.ui.datepicker" ], factory );
- } else {
-
- // Browser globals
- factory( jQuery.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',
- firstDay: 6,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- datepicker.setDefaults(datepicker.regional['ar']);
-
- return datepicker.regional['ar'];
-
-}));
diff --git a/demos/datepicker/datepicker-fr.js b/demos/datepicker/datepicker-fr.js
deleted file mode 100644
index 33fa80d48f3..00000000000
--- a/demos/datepicker/datepicker-fr.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood{at}iinet.com.au),
- Stéphane Nahmani (sholby@sholby.net),
- Stéphane Raimbault */
-(function( factory ) {
- if ( typeof define === "function" && define.amd ) {
-
- // AMD. Register as an anonymous module.
- define([ "../jquery.ui.datepicker" ], factory );
- } else {
-
- // Browser globals
- factory( jQuery.datepicker );
- }
-}(function( datepicker ) {
- datepicker.regional['fr'] = {
- closeText: 'Fermer',
- prevText: 'Précédent',
- nextText: 'Suivant',
- currentText: 'Aujourd\'hui',
- monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
- 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
- monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
- 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
- dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
- dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
- dayNamesMin: ['D','L','M','M','J','V','S'],
- weekHeader: 'Sem.',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- datepicker.setDefaults(datepicker.regional['fr']);
-
- return datepicker.regional['fr'];
-
-}));
diff --git a/demos/datepicker/datepicker-he.js b/demos/datepicker/datepicker-he.js
deleted file mode 100644
index bf58038f586..00000000000
--- a/demos/datepicker/datepicker-he.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Hebrew initialisation for the UI Datepicker extension. */
-/* Written by Amir Hardon (ahardon at gmail dot com). */
-(function( factory ) {
- if ( typeof define === "function" && define.amd ) {
-
- // AMD. Register as an anonymous module.
- define([ "../jquery.ui.datepicker" ], factory );
- } else {
-
- // Browser globals
- factory( jQuery.datepicker );
- }
-}(function( datepicker ) {
- datepicker.regional['he'] = {
- closeText: 'סגור',
- prevText: '<הקודם',
- nextText: 'הבא>',
- currentText: 'היום',
- monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
- 'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
- monthNamesShort: ['ינו','פבר','מרץ','אפר','מאי','יוני',
- 'יולי','אוג','ספט','אוק','נוב','דצמ'],
- dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
- dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
- dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- datepicker.setDefaults(datepicker.regional['he']);
-
- return datepicker.regional['he'];
-
-}));
diff --git a/demos/datepicker/datepicker-zh-TW.js b/demos/datepicker/datepicker-zh-TW.js
deleted file mode 100644
index ebfd73ac5ab..00000000000
--- a/demos/datepicker/datepicker-zh-TW.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Ressol (ressol@gmail.com). */
-(function( factory ) {
- if ( typeof define === "function" && define.amd ) {
-
- // AMD. Register as an anonymous module.
- define([ "../jquery.ui.datepicker" ], factory );
- } else {
-
- // Browser globals
- factory( jQuery.datepicker );
- }
-}(function( datepicker ) {
- datepicker.regional['zh-TW'] = {
- closeText: '關閉',
- prevText: '<上月',
- nextText: '下月>',
- currentText: '今天',
- monthNames: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- monthNamesShort: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
- dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
- dayNamesMin: ['日','一','二','三','四','五','六'],
- weekHeader: '周',
- dateFormat: 'yy/mm/dd',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: '年'};
- datepicker.setDefaults(datepicker.regional['zh-TW']);
-
- return datepicker.regional['zh-TW'];
-
-}));
diff --git a/demos/datepicker/default.html b/demos/datepicker/default.html
index a11d5def7a9..b2439b29ab3 100644
--- a/demos/datepicker/default.html
+++ b/demos/datepicker/default.html
@@ -5,8 +5,14 @@
jQuery UI Datepicker - Default functionality
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demos/datepicker/index.html b/demos/datepicker/index.html
index d9c8dfc10da..5587564831f 100644
--- a/demos/datepicker/index.html
+++ b/demos/datepicker/index.html
@@ -9,19 +9,11 @@
-
-Date:
-
-
-
Display the datepicker embedded in the page instead of in an overlay. Simply call .datepicker() on a div instead of an input.
-
-
diff --git a/demos/datepicker/inline.html b/demos/datepicker/inline.html
deleted file mode 100644
index 5d120457b77..00000000000
--- a/demos/datepicker/inline.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-