diff --git a/Gruntfile.js b/Gruntfile.js index 0c9bf44473e..86d921a83a4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -126,7 +126,12 @@ grunt.initConfig({ findNestedDependencies: true, skipModuleInsertion: true, exclude: [ "jquery" ], - include: expandFiles( [ "ui/**/*.js", "!ui/i18n/*" ] ), + include: expandFiles( [ + "ui/**/*.js", + "!ui/widgets/calendar.js", + "!ui/widgets/datepicker.js", + "!ui/i18n/*" + ] ), out: "dist/jquery-ui.js", wrap: { start: createBanner( uiFiles ), @@ -224,6 +229,16 @@ grunt.initConfig({ destPrefix: "external" }, files: { + "cldrjs/cldr.js": "cldrjs/dist/cldr.js", + "cldrjs/cldr/event.js": "cldrjs/dist/cldr/event.js", + "cldrjs/cldr/supplemental.js": "cldrjs/dist/cldr/supplemental.js", + "cldrjs/LICENSE-MIT": "cldrjs/LICENSE-MIT", + + "globalize/globalize.js": "globalize/dist/globalize.js", + "globalize/globalize/number.js": "globalize/dist/globalize/number.js", + "globalize/globalize/date.js": "globalize/dist/globalize/date.js", + "globalize/LICENSE.txt": "globalize/LICENSE.txt", + "qunit/qunit.js": "qunit/qunit/qunit.js", "qunit/qunit.css": "qunit/qunit/qunit.css", "qunit/LICENSE.txt": "qunit/LICENSE.txt", diff --git a/bower.json b/bower.json index 2c8b5a6baee..614e4f78a03 100644 --- a/bower.json +++ b/bower.json @@ -19,6 +19,7 @@ "qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1", "qunit-composite": "JamesMGreene/qunit-composite#v1.1.0", "requirejs": "2.1.14", + "globalize": "1.0.0", "jquery-1.7.0": "jquery#1.7.0", "jquery-1.7.1": "jquery#1.7.1", diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 3aca0e7b2f3..b889c6c3698 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", "Datepicker": "datepicker/datepicker.html", "Dialog": "dialog/dialog.html", diff --git a/demos/bootstrap.js b/demos/bootstrap.js index 7a942374d24..efac1b838cf 100644 --- a/demos/bootstrap.js +++ b/demos/bootstrap.js @@ -30,6 +30,7 @@ var widgets = [ "accordion", "autocomplete", "button", + "calendar", "datepicker", "dialog", "draggable", @@ -78,12 +79,15 @@ document.documentElement.className = "demo-loading"; require.config( { 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/" }, shim: { - "external/globalize/globalize.culture.de-DE": [ "external/globalize/globalize" ], - "external/globalize/globalize.culture.ja-JP": [ "external/globalize/globalize" ] + "external/globalize-old/globalize.culture.de-DE": [ "external/globalize-old/globalize" ], + "external/globalize-old/globalize.culture.ja-JP": [ "external/globalize-old/globalize" ] } } ); diff --git a/demos/calendar/buttonbar.html b/demos/calendar/buttonbar.html new file mode 100644 index 00000000000..28ee693cc31 --- /dev/null +++ b/demos/calendar/buttonbar.html @@ -0,0 +1,28 @@ + + +
+ + +Display a button for selecting Today's date with the buttons option.
Display the datepicker embedded in the page instead of in an overlay. Simply call .datepicker() on a div instead of an input.
+The calendar is a widget for selecting a date using a visual calendar representation.