Datepicker: Use Globalize 1.0.0

- Make all demos work
- Fix calendar localization demo
- Fix merge errors

diff --git a/demos/calendar/buttonbar.html b/demos/calendar/buttonbar.html
index de2ae22dcd706b843ba55ef3ff0abf34b256dd4c..ac519247ccccb4ffd85d80590811c840ce0b00d3 100644 (file)
--- a/demos/calendar/buttonbar.html
+++ b/demos/calendar/buttonbar.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Display button bar</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/default.html b/demos/calendar/default.html
index a67c2d7028f645917eb3f59692e88d9cea649c2d..e22cc797fb26622a2e25de24c45738c14ade5caa 100644 (file)
--- a/demos/calendar/default.html
+++ b/demos/calendar/default.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Default functionality</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/dropdown-month-year.html b/demos/calendar/dropdown-month-year.html
index 050a89157ffb315757d47ffb4e154d54eec00965..71b8777cb3a72cc7ed97bac02b34abb8a5a2fdd9 100644 (file)
--- a/demos/calendar/dropdown-month-year.html
+++ b/demos/calendar/dropdown-month-year.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Display month &amp; year menus</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/localization.html b/demos/calendar/localization.html
index 9b1e7d070127a7cea50558af7aba75439e4829a5..5c325d0a0713e8126bdb4e99b6d5e302f5a33d10 100644 (file)
--- a/demos/calendar/localization.html
+++ b/demos/calendar/localization.html
@@ -4,25 +4,32 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Localize calendar</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {
                var calendar = $( "#calendar" ),
                        select = $( "#locale" );
 
-               Globalize.locale( select.val() );
-               calendar.calendar();
+               calendar.calendar({
+                       locale: select.val()
+               });
+
                select.change( function() {
-                       Globalize.locale( $( this ).val() );
+                       calendar.calendar( "option", {
+                               locale: select.val()
+                       });
                        calendar.calendar( "valueAsDate", calendar.calendar( "valueAsDate" ) );
                });
        });
@@ -32,8 +39,11 @@
 
 <div id="calendar"></div>
 <select id="locale">
-       <option value="de-DE" selected>German (Deutsch)</option>
+       <option value="ar">Arabic</option>
+       <option value="de" selected>German</option>
        <option value="en">English</option>
+       <option value="es">Spanish</option>
+       <option value="zh">Chinese Simplified</option>
 </select>
 
 <div class="demo-description">

diff --git a/demos/calendar/min-max.html b/demos/calendar/min-max.html
index fa8471e2cb992c1019af0914b74a10bab1e3140b..953e78883559cdb4de01f6d269b411d5a83f065e 100644 (file)
--- a/demos/calendar/min-max.html
+++ b/demos/calendar/min-max.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Restrict date range</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/multiple-months.html b/demos/calendar/multiple-months.html
index 8366b22044e478ffdefcfa6ad7843efa318bf4f9..99248d8c2ed70d8ad941d421015c9e2e60518667 100644 (file)
--- a/demos/calendar/multiple-months.html
+++ b/demos/calendar/multiple-months.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Display multiple months</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/other-months.html b/demos/calendar/other-months.html
index 0228c62df5b49b92067a9a8d2d32e4533c0b0e9a..5f891b2021eda6938318d720ac094047572b8824 100644 (file)
--- a/demos/calendar/other-months.html
+++ b/demos/calendar/other-months.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Dates in other months</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/calendar/show-week.html b/demos/calendar/show-week.html
index 08687aa0deaa531afcead35ffa927c1cf5ab65d6..6443b6de1b3db46c237fb8688ff4b16368caa9de 100644 (file)
--- a/demos/calendar/show-week.html
+++ b/demos/calendar/show-week.html
@@ -4,15 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Calendar - Show week of the year</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
+       <script src="../../external/cldrjs/cldr.js"></script>
+       <script src="../../external/cldrjs/cldr/supplemental.js"></script>
+       <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
        <script src="../../ui/calendar.js"></script>
-       <script src="../../ui/position.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>
        $(function() {

diff --git a/demos/datepicker/animation.html b/demos/datepicker/animation.html
index d4549289e757f7100ab0d8d6c3354f4254d3cbf2..eda91738617e7cd6d2775d270ed6f7890f8dab66 100644 (file)
--- a/demos/datepicker/animation.html
+++ b/demos/datepicker/animation.html
@@ -9,10 +9,9 @@
        <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-+      <script src="../../external/globalize/globalize/date.js"></script>
-+      <script src="../../external/globalize/globalize/message.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/effect.js"></script>

diff --git a/demos/datepicker/date-formats.html b/demos/datepicker/date-formats.html
index d2b07a796feb176b97847d0f334a8b47159efdf2..e17252901b527a7101f563df187303579c408f20 100644 (file)
--- a/demos/datepicker/date-formats.html
+++ b/demos/datepicker/date-formats.html
@@ -9,15 +9,14 @@
        <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-+      <script src="../../external/globalize/globalize/date.js"></script>
-+      <script src="../../external/globalize/globalize/message.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
-       <script src="../../ui/position.js"></script>
        <script src="../../ui/calendar.js"></script>
+       <script src="../../ui/position.js"></script>
        <script src="../../ui/datepicker.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>

diff --git a/demos/datepicker/default.html b/demos/datepicker/default.html
index 8dc56a505f74ba66528242f9d8e5ac452b6a16d9..89f1ceaa92592d243a67290a086352c080fe922e 100644 (file)
--- a/demos/datepicker/default.html
+++ b/demos/datepicker/default.html
@@ -9,15 +9,14 @@
        <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-+      <script src="../../external/globalize/globalize/date.js"></script>
-+      <script src="../../external/globalize/globalize/message.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
        <script src="../../ui/button.js"></script>
-       <script src="../../ui/position.js"></script>
        <script src="../../ui/calendar.js"></script>
+       <script src="../../ui/position.js"></script>
        <script src="../../ui/datepicker.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <script>

diff --git a/demos/datepicker/icon-trigger.html b/demos/datepicker/icon-trigger.html
index e95b7857e5087901d32c41d53b99b9741494ac2c..4faeb31c761385fc2c4617f3cd26368a94b2a232 100644 (file)
--- a/demos/datepicker/icon-trigger.html
+++ b/demos/datepicker/icon-trigger.html
@@ -9,14 +9,13 @@
        <script src="../../external/cldrjs/cldr/event.js"></script>
        <script src="../../external/jquery/jquery.js"></script>
        <script src="../../external/globalize/globalize.js"></script>
-+      <script src="../../external/globalize/globalize/date.js"></script>
-+      <script src="../../external/globalize/globalize/message.js"></script>
+       <script src="../../external/globalize/globalize/date.js"></script>
        <script src="../../external/localization.js"></script>
-       <script src="../../external/date.js"></script>
+       <script src="../../ui/calendar/date.js"></script>
        <script src="../../ui/core.js"></script>
        <script src="../../ui/widget.js"></script>
-       <script src="../../ui/calendar.js"></script>
        <script src="../../ui/button.js"></script>
+       <script src="../../ui/calendar.js"></script>
        <script src="../../ui/position.js"></script>
        <script src="../../ui/datepicker.js"></script>
        <link rel="stylesheet" href="../demos.css">