Changeset 4289

Timestamp:

12/21/07 00:48:41 (1 year ago)

Author:

grabanski@…

Message:

Fixed this.input error in IE6. Commented out line 227, which creates bug in IE6 and never fires in Firefox.

Location:

trunk/ui/current/datepicker/core

Files:

• index.html (modified) (1 diff)
• ui.datepicker.js (modified) (8 diffs)

trunk/ui/current/datepicker/core/index.html

@@ -15 +15 @@
         <!-- Attach the datepicker to dateinput after document is ready -->
         <script type="text/javascript" charset="utf-8">
-            $(document).ready(function() {
+            jQuery(function($){
                 $("#dateinput").datepicker();
             });

trunk/ui/current/datepicker/core/ui.datepicker.js

@@ -225 +225 @@
         input[0]._calId = inst._id;
         this._updateDatepicker(inst);
-        inst._datepickerDiv.resize(function() { $.datepicker._inlineShow(inst); });
+        /* @todo: fix _inlineShow automatic resizing
+            - Endless loop bug in IE6.  
+            - inst._datepickerDiv.resize doesn't ever fire in firefox.  */
+        // inst._datepickerDiv.resize(function() { $.datepicker._inlineShow(inst); });
     },
 
@@ -233 +236 @@
         numMonths = (numMonths == null ? 1 : (typeof numMonths == 'number' ? numMonths : numMonths[1]));
         inst._datepickerDiv.width(numMonths * $('.datepicker', inst._datepickerDiv[0]).width());
-    },
+    }, 
 
     /* Does this element have a particular class? */
@@ -479 +482 @@
         numMonths = (numMonths == null ? 1 : (typeof numMonths == 'number' ? numMonths : numMonths[1]));
         inst._datepickerDiv.width(numMonths * $('.datepicker', inst._datepickerDiv[0]).width());
-        if ($.browser.msie) { // fix IE < 7 select problems
+        if ($.browser.msie && parseInt($.browser.version) < 7) { // fix IE < 7 select problems
             $('#datepicker_cover').css({width: inst._datepickerDiv.width() + 4,
                 height: inst._datepickerDiv.height() + 4});
@@ -485 +488 @@
         // re-position on screen if necessary
         var isFixed = inst._datepickerDiv.css('position') == 'fixed';
-        var pos = $.datepicker._findPos(inst._input[0]);
+        var pos = inst._input ? $.datepicker._findPos(inst._input[0]) : null;
         var browserWidth = window.innerWidth || document.documentElement.clientWidth ||
             document.body.clientWidth;
@@ -497 +500 @@
                 (browserWidth + scrollX)) {
             inst._datepickerDiv.css('left', Math.max(scrollX,
-                pos[0] + $(inst._input[0]).width() - inst._datepickerDiv.width() -
+                pos[0] + (inst._input ? $(inst._input[0]).width() : null) - inst._datepickerDiv.width() -
                 (isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0)) + 'px');
         }
@@ -694 +697 @@
         }
         else {
-            inst._input.trigger('change'); // fire the change event
+            if (inst._input) {
+                inst._input.trigger('change'); // fire the change event
+            }
         }
         if (inst._inline) {
@@ -1049 +1054 @@
         this._input = $(input);
         var dateFormat = this._get('dateFormat');
-        var dates = this._input.val().split(this._get('rangeSeparator'));
+        var dates = inst._input ? this._input.val().split(this._get('rangeSeparator')) : null;
         this._endDay = this._endMonth = this._endYear = null;
         var shortYearCutoff = this._get('shortYearCutoff');
@@ -1248 +1253 @@
             '" class="datepicker_status">' + this._get('initStatus') + '</div>' : '') +
             (!closeAtTop && !this._inline ? controls : '') +
-            '<div style="clear: both;"></div>' + (!$.browser.msie ? '' :
-            '<!--[if lte IE 6.5]><iframe src="javascript:false;" class="datepicker_cover"></iframe><![endif]-->');
+            '<div style="clear: both;"></div>' + 
+            ($.browser.msie && parseInt($.browser.version) < 7 && !this._inline ? '' :
+            '<iframe src="javascript:false;" class="datepicker_cover"></iframe>');
         return html;
     },