aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.datepicker.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-02-09 03:29:10 +0100
committerFelix Nagel <info@felixnagel.com>2013-02-09 03:29:10 +0100
commita7b4f29cea06607264c2ba98cd93f4e039cce5bd (patch)
tree1ac9e210ce8fd16a85cb1d3283983475b27437ed /ui/jquery.ui.datepicker.js
parentb81bb0b983687b1efc09577bf128b8a5b7aa5d7b (diff)
parentab408c9b82430e7a65a9269441cc0c0e2af95770 (diff)
downloadjquery-ui-a7b4f29cea06607264c2ba98cd93f4e039cce5bd.tar.gz
jquery-ui-a7b4f29cea06607264c2ba98cd93f4e039cce5bd.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.datepicker.js')
-rw-r--r--ui/jquery.ui.datepicker.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index e93f596fc..efee7a819 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1741,7 +1741,7 @@ $.extend(Datepicker.prototype, {
(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
- ((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2] + "'" : "") + // cell title
+ ((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +