aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMaciej Mroziński <mrozik87@gmail.com>2012-07-16 13:09:52 +0200
committerScott González <scott.gonzalez@gmail.com>2012-07-17 16:08:31 -0400
commitb4ef2f7ebb1162f75d8fa3276d73e4746bcace84 (patch)
treeac57626af3d1c0027b72c8a21d51408a59c761fc /ui
parent75105f612c80bac6f3e8150225fdf2da90ff2f33 (diff)
downloadjquery-ui-b4ef2f7ebb1162f75d8fa3276d73e4746bcace84.tar.gz
jquery-ui-b4ef2f7ebb1162f75d8fa3276d73e4746bcace84.zip
Datepicker: Modified _updateDatepicker to not update display if updated instance is not current instance. Fixed #6814 - datepicker('setDate') incorrectly overwrites current display with two datepickers.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.datepicker.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 06db79ba7..4c260a1c8 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -708,6 +708,9 @@ $.extend(Datepicker.prototype, {
/* Generate the date picker content. */
_updateDatepicker: function(inst) {
+ if ($.datepicker._curInst && inst != $.datepicker._curInst) {
+ return;
+ }
this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
var borders = $.datepicker._getBorders(inst.dpDiv);
instActive = inst; // for delegate hover events