]> source.dussan.org Git - jquery-ui.git/commitdiff
Merge branch 'master' into datepicker
authorFelix Nagel <info@felixnagel.com>
Wed, 7 Oct 2015 22:38:07 +0000 (00:38 +0200)
committerFelix Nagel <info@felixnagel.com>
Wed, 7 Oct 2015 22:40:37 +0000 (00:40 +0200)
19 files changed:
1  2 
Gruntfile.js
demos/bootstrap.js
demos/calendar/buttonbar.html
demos/calendar/default.html
demos/calendar/dropdown-month-year.html
demos/calendar/localization.html
demos/calendar/min-max.html
demos/calendar/multiple-months.html
demos/calendar/other-months.html
demos/calendar/show-week.html
demos/datepicker/animation.html
demos/datepicker/date-formats.html
demos/datepicker/icon-trigger.html
demos/datepicker/localization.html
demos/spinner/currency.html
demos/spinner/decimal.html
demos/spinner/time.html
tests/lib/bootstrap.js
tests/unit/spinner/options.js

diff --cc Gruntfile.js
Simple merge
index faffcbdd89bd523de2c14decace6ae8625ecabc2,7a942374d24c201aa712459612540bca6bb0fa01..efac1b838cf6d61f1a74884adbfb792a119bf3a5
@@@ -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/"
        },
index 9acd89bdd55f4a2138cd027829604246bff04b8a,0000000000000000000000000000000000000000..28ee693cc314eacba03e5df29425cc527368a2d3
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,28 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Display button bar</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar({
 +                      buttons: {
 +                              Today: function() {
 +                                      $( this ).calendar( "valueAsDate", new Date() );
 +                              }
 +                      }
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>Display a button for selecting Today's date with the <code>buttons</code> option.</p>
 +</div>
 +</body>
 +</html>
index 9be0f19885b3cb7885c2350eecd90b011debbe6c,0000000000000000000000000000000000000000..1a2cfdf77f370ef57d052a14b9e7f9917793e479
mode 100644,000000..100644
--- /dev/null
@@@ -1,21 -1,0 +1,22 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Default functionality</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar();
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>The calendar is a widget for selecting a date using a visual calendar representation.</p>
 +</div>
 +</body>
 +</html>
index 3aacaef4743ae16e3a6b1e0cc13eb5fef1b62077,0000000000000000000000000000000000000000..92b7e24fb60659ae6ba3fbb7275af657761a9841
mode 100644,000000..100644
--- /dev/null
@@@ -1,24 -1,0 +1,25 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Display month &amp; year menus</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar({
 +                      changeMonth: true,
 +                      changeYear: true
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>Show month and year dropdowns in place of the static month/year header to facilitate navigation through large timeframes.  Add the boolean <code>changeMonth</code> and <code>changeYear</code> options.</p>
 +</div>
 +</body>
 +</html>
index df50ca2c9bda091adab1af398bfb37123f6d4e2d,0000000000000000000000000000000000000000..dfd8b1f1e68167eecb051c72271b94f6d189b70b
mode 100644,000000..100644
--- /dev/null
@@@ -1,41 -1,0 +1,41 @@@
-       <link rel="stylesheet" href="../../themes/base/all.css">
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Localize calendar</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js" data-modules="external/localization">
 +              var calendar = $( "#calendar" ),
 +                      select = $( "#locale" );
 +
 +              calendar.calendar({
 +                      locale: select.val()
 +              });
 +
 +              select.change( function() {
 +                      calendar.calendar( "option", {
 +                              locale: select.val()
 +                      });
 +                      calendar.calendar( "valueAsDate", calendar.calendar( "valueAsDate" ) );
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +<select id="locale">
 +      <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">
 +<p>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.</p>
 +</div>
 +</body>
 +</html>
index d4b074a5eced14bd81e5e96e587cab2cf1dd24fd,0000000000000000000000000000000000000000..b3036b8739ca8b500421575362f59f44e8a2d7bc
mode 100644,000000..100644
--- /dev/null
@@@ -1,28 -1,0 +1,33 @@@
-                       max: dateMax
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
 +      <title>jQuery UI Calendar - Restrict date range</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              var now = new Date(),
 +                      dateMin = new Date( now.getFullYear(), now.getMonth(), now.getDate() + 1 ),
 +                      dateMax = new Date( now.getFullYear(), now.getMonth(), now.getDate() + 8 );
 +
++              dateMin = new Date( 2008, 2 - 1, 29 );
++              dateMax = new Date( 2008, 12 - 1, 7 );
++
++
 +              $( "#calendar" ).calendar({
 +                      min: dateMin,
++                      max: dateMax,
++                      value: new Date( 2008, 1 - 1, 4 )
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>Restrict the range of selectable dates with the <code>min</code> and <code>max</code> options. Set the beginning and end dates as actual dates (<code>new Date(2009, 1 - 1, 26)</code>).</p>
 +</div>
 +</body>
 +</html>
index 3bde416c0bc8bf9eb590b65e0ccb5c613e686aae,0000000000000000000000000000000000000000..f83da1f8206bd4072cea5cd6c4cc07623dfcab88
mode 100644,000000..100644
--- /dev/null
@@@ -1,23 -1,0 +1,24 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Display multiple months</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar({
 +                      numberOfMonths: 3
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>Set the <code>numberOfMonths</code> option to an integer of 2 or more to show multiple months in a single calendar.</p>
 +</div>
 +</body>
 +</html>
index ac8df8d3a8bbb6f3d5518b8fed85918100b90ffd,0000000000000000000000000000000000000000..2fb4dacf84cb231efdf6cae2373ae929a4dd7b3d
mode 100644,000000..100644
--- /dev/null
@@@ -1,30 -1,0 +1,31 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Dates in other months</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar({
 +                      eachDay: function( day ) {
 +                              if ( day.lead ) {
 +                                      day.render = true;
 +                                      day.selectable = true;
 +                                      day.extraClasses = "ui-priority-secondary";
 +                              }
 +                      }
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>The calendar can show dates that come from other than the main month
 +      being displayed. These other dates can also be made selectable.</p>
 +</div>
 +</body>
 +</html>
index 96f3c7da2510195e2aa923e20ef47e0c16c8b339,0000000000000000000000000000000000000000..e148b657068fdd8c423b02226703adddc6d9b491
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,26 @@@
 +<!doctype html>
 +<html lang="en">
 +<head>
 +      <meta charset="utf-8">
++      <meta name="viewport" content="width=device-width, initial-scale=1">
 +      <title>jQuery UI Calendar - Show week of the year</title>
 +      <link rel="stylesheet" href="../../themes/base/all.css">
 +      <link rel="stylesheet" href="../demos.css">
 +      <script src="../../external/requirejs/require.js"></script>
 +      <script src="../bootstrap.js">
 +              $( "#calendar" ).calendar({
 +                      showWeek: true
 +              });
 +      </script>
 +</head>
 +<body>
 +
 +<div id="calendar"></div>
 +
 +<div class="demo-description">
 +<p>The calendar can show the week of the year. The calculation follows
 +      <a href="http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table">Unicode CLDR specification</a>.
 +      This means that some days from one year may be placed into weeks 'belonging' to another year.</p>
 +</div>
 +</body>
 +</html>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 89c4d489363410f722ce65e31be6a4916e69c48a,2fe2edd1bd081f03417f6edf4c782ad7feb4ae69..745ddefb187b10afaf9523a499f26d413a26323d
@@@ -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",
Simple merge