Changeset 28780 for trunk/themes/default/js/ui/jquery.ui.datepicker.js

Timestamp:

Jun 24, 2014, 10:16:59 PM (10 years ago)

Author:

rvelices

Message:

upgrade jquery ui from 1.10.1 to 1.10.4

File:

• trunk/themes/default/js/ui/jquery.ui.datepicker.js (modified) (7 diffs)

trunk/themes/default/js/ui/jquery.ui.datepicker.js

@@ -1 +1 @@
 /*!
- * jQuery UI Datepicker 1.10.1
+ * jQuery UI Datepicker 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
@@ -14 +14 @@
 (function( $, undefined ) {
 
-$.extend($.ui, { datepicker: { version: "1.10.1" } });
+$.extend($.ui, { datepicker: { version: "1.10.4" } });
 
 var PROP_NAME = "datepicker",
-        dpuuid = new Date().getTime(),
         instActive;
 
@@ -754 +753 @@
                         }
 
-                        if (inst.input.is(":visible") && !inst.input.is(":disabled")) {
+                        if ( $.datepicker._shouldFocusInput( inst ) ) {
                                 inst.input.focus();
                         }
+
                         $.datepicker._curInst = inst;
                 }
@@ -783 +783 @@
                         "Class"]("ui-datepicker-rtl");
 
-                // #6694 - don't focus the input if it's already focused
-                // this breaks the change event in IE
-                if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
-                        inst.input.is(":visible") && !inst.input.is(":disabled") && inst.input[0] !== document.activeElement) {
+                if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
                         inst.input.focus();
                 }
@@ -803 +800 @@
         },
 
-        /* Retrieve the size of left and top borders for an element.
-         * @param  elem  (jQuery object) the element of interest
-         * @return  (number[2]) the left and top borders
-         */
-        _getBorders: function(elem) {
-                var convert = function(value) {
-                        return {thin: 1, medium: 2, thick: 3}[value] || value;
-                };
-                return [parseFloat(convert(elem.css("border-left-width"))),
-                        parseFloat(convert(elem.css("border-top-width")))];
+        // #6694 - don't focus the input if it's already focused
+        // this breaks the change event in IE
+        // Support: IE and jQuery <1.9
+        _shouldFocusInput: function( inst ) {
+                return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
         },
 
@@ -1559 +1551 @@
                         var handler = {
                                 prev: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, -stepMonths, "M");
+                                        $.datepicker._adjustDate(id, -stepMonths, "M");
                                 },
                                 next: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, +stepMonths, "M");
+                                        $.datepicker._adjustDate(id, +stepMonths, "M");
                                 },
                                 hide: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._hideDatepicker();
+                                        $.datepicker._hideDatepicker();
                                 },
                                 today: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._gotoToday(id);
+                                        $.datepicker._gotoToday(id);
                                 },
                                 selectDay: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+                                        $.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
                                         return false;
                                 },
                                 selectMonth: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "M");
+                                        $.datepicker._selectMonthYear(id, this, "M");
                                         return false;
                                 },
                                 selectYear: function () {
-                                        window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "Y");
+                                        $.datepicker._selectMonthYear(id, this, "Y");
                                         return false;
                                 }
@@ -2042 +2034 @@
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.10.1";
-
-// Workaround for #4055
-// Add another global to avoid noConflict issues with inline event handlers
-window["DP_jQuery_" + dpuuid] = $;
+$.datepicker.version = "1.10.4";
 
 })(jQuery);