aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-01-31 22:04:09 -0500
committerScott González <scott.gonzalez@gmail.com>2011-01-31 22:04:09 -0500
commitcb8f5b7f2679ab5473229cac432f28c72521048c (patch)
tree60b63ec0b7f190832dcadef9e04a195985e61621 /demos
parentbb857ddd8d6d4ac7620b49bf765352cd064494c0 (diff)
parenteffbb2c0ec2e60bea6ec5e5822ee52f8ea9e18bc (diff)
downloadjquery-ui-cb8f5b7f2679ab5473229cac432f28c72521048c.tar.gz
jquery-ui-cb8f5b7f2679ab5473229cac432f28c72521048c.zip
Merge branch 'master' into widget-events
Conflicts: ui/jquery.ui.widget.js
Diffstat (limited to 'demos')
-rw-r--r--demos/datepicker/date-range.html2
-rw-r--r--demos/datepicker/localization.html2
-rw-r--r--demos/index.html1
3 files changed, 4 insertions, 1 deletions
diff --git a/demos/datepicker/date-range.html b/demos/datepicker/date-range.html
index 1e3beb2a2..6bce3f776 100644
--- a/demos/datepicker/date-range.html
+++ b/demos/datepicker/date-range.html
@@ -17,7 +17,7 @@
numberOfMonths: 3,
onSelect: function( selectedDate ) {
var option = this.id == "from" ? "minDate" : "maxDate",
- instance = $( this ).data( "datepicker" );
+ instance = $( this ).data( "datepicker" ),
date = $.datepicker.parseDate(
instance.settings.dateFormat ||
$.datepicker._defaults.dateFormat,
diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 33d03c98c..767cdaa54 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -10,6 +10,7 @@
<script src="../../ui/jquery.ui.datepicker.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-af.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+ <script src="../../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
@@ -87,6 +88,7 @@
<select id="locale">
<option value="af">Afrikaans</option>
<option value="sq">Albanian (Gjuha shqipe)</option>
+ <option value="ar-DZ">Algerian Arabic</option>
<option value="ar">Arabic (&#8235;(&#1604;&#1593;&#1585;&#1576;&#1610;</option>
<option value="hy">Armenian (&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;)</option>
<option value="az">Azerbaijani (Az&#601;rbaycan dili)</option>
diff --git a/demos/index.html b/demos/index.html
index c1efefe73..e1f4eec91 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -44,6 +44,7 @@
<script src="../ui/jquery.effects.transfer.js"></script>
<script src="../ui/i18n/jquery.ui.datepicker-af.js"></script>
<script src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+ <script src="../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
<script src="../ui/i18n/jquery.ui.datepicker-az.js"></script>
<script src="../ui/i18n/jquery.ui.datepicker-bs.js"></script>
<script src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>