Remove use of $.browser; add $.ui.ie and $.ui.ie6 temporarily.

diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
index e281e2feeba279129e56ad83b4c5612be185adff..790c88c27b818883a57ab8ae11a32729870baa04 100644 (file)
--- a/tests/jquery.simulate.js
+++ b/tests/jquery.simulate.js
@@ -148,7 +148,7 @@ $.extend( $.simulate.prototype, {
                }
 
                // TODO: can we hook into core's logic?
-               if ( $.browser.msie || $.browser.opera ) {
+               if ( $.ui.ie || (({}).toString.call( window.opera ) === "[object Opera]") ) {
                        // TODO: is charCode ever <0 ? Can we just use charCode || keyCode?
                        event.keyCode = (options.charCode > 0) ? options.charCode : options.keyCode;
                        event.charCode = undefined;

diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 17cefe1576d756a7b3c1ebc5f75b9c128a927e16..e17b239e5cfdd7b0187e788c510d59d3e0d00261 100644 (file)
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -59,7 +59,7 @@ test('baseStructure', function() {
        var header, title, table, thead, week, panel, inl, child,
                inp = init('#inp').focus(),
                dp = $('#ui-datepicker-div'),
-               iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+               iframe = ($.ui.ie6);
        ok(dp.is(':visible'), 'Structure - datepicker visible');
        ok(!dp.is('.ui-datepicker-rtl'), 'Structure - not right-to-left');
        ok(!dp.is('.ui-datepicker-multi'), 'Structure - not multi-month');
@@ -186,7 +186,7 @@ test('customStructure', function() {
                inp = init('#inp', $.datepicker.regional.he);
        inp.data('showButtonPanel.datepicker',true);
        inp.focus();
-       iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+       iframe = ($.ui.ie6);
        ok(dp.is('.ui-datepicker-rtl'), 'Structure RTL - right-to-left');
        header = dp.children(':first');
        ok(header.is('div.ui-datepicker-header'), 'Structure RTL - header division');

diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index bb9411dc917de66bf20a466586e41c571bb0cd8e..e569eea423fba1979db5a263bd02c024ad7e0978 100644 (file)
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -69,7 +69,7 @@ $.fn.extend({
 
        scrollParent: function() {
                var scrollParent;
-               if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+               if (($.ui.ie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
                        scrollParent = this.parents().filter(function() {
                                return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
                        }).eq(0);
@@ -258,6 +258,12 @@ $(function() {
 
 // deprecated
 
+(function() {
+       var uaMatch = /msie ([\w.]+)/.exec( navigator.userAgent.toLowerCase() ) || [];
+       $.ui.ie = uaMatch.length ? true : false;
+       $.ui.ie6 = parseFloat( uaMatch[ 1 ], 10 ) === 6;
+})();
+
 $.fn.extend({
        disableSelection: function() {
                return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 9ea36924b94f0066997cdfeb2308075b288da5b2..4643af2eb0f5246043271d8cc2e4ed6457c72799 100644 (file)
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1605,7 +1605,7 @@ $.extend(Datepicker.prototype, {
                        }
                        html += group;
                }
-               html += buttonPanel + ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+               html += buttonPanel + ($.ui.ie6 && !inst.inline ?
                        '<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
                inst._keyEvent = false;
                return html;

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 98bd7fcaa86ad28b780165575faf4c4afcd7fca8..8593fff8543b2cd7ae92a05efd18adc2607b5ec1 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -768,7 +768,7 @@ $.extend( $.ui.dialog.overlay, {
                var scrollHeight,
                        offsetHeight;
                // handle IE
-               if ( $.browser.msie ) {
+               if ( $.ui.ie ) {
                        scrollHeight = Math.max(
                                document.documentElement.scrollHeight,
                                document.body.scrollHeight
@@ -793,7 +793,7 @@ $.extend( $.ui.dialog.overlay, {
                var scrollWidth,
                        offsetWidth;
                // handle IE
-               if ( $.browser.msie ) {
+               if ( $.ui.ie ) {
                        scrollWidth = Math.max(
                                document.documentElement.scrollWidth,
                                document.body.scrollWidth

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 2e33e3311b7341f4889db54c60dffeece41ebe7e..e110bd8a4498a4669edeb12a607478ef7075d40d 100644 (file)
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -318,7 +318,7 @@ $.widget("ui.draggable", $.ui.mouse, {
                }
 
                if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-               || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+               || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
                        po = { top: 0, left: 0 };
 
                return {

diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 30546ffc4ffa7b7a3ad06be972d9ab3c02566881..f5069d00c430288947e4a2295397c4c39881363e 100644 (file)
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -111,7 +111,7 @@ $.widget("ui.mouse", {
 
        _mouseMove: function(event) {
                // IE mouseup check - mouseup happened when mouse was out of window
-               if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
+               if ($.ui.ie && !(document.documentMode >= 9) && !event.button) {
                        return this._mouseUp(event);
                }
 

diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 724ae9ddf806daf9be1413307c19e6bc870e9bde..cc82b8b92700628429206aa545133750b9e52be0 100644 (file)
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -466,8 +466,8 @@ $.widget("ui.resizable", $.ui.mouse, {
                        this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
 
                        // fix ie6 offset TODO: This seems broken
-                       var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
-                       pxyoffset = ( ie6 ? 2 : -1 );
+                       var ie6offset = ($.ui.ie6 ? 1 : 0),
+                       pxyoffset = ( $.ui.ie6 ? 2 : -1 );
 
                        this.helper.addClass(this._helper).css({
                                width: this.element.outerWidth() + pxyoffset,

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 070dff6cdcf8916a5baaf280e65ffafc9fc211cb..920e645d4cecbaa0d00dbb378ee12174b878b7f5 100644 (file)
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -822,7 +822,7 @@ $.widget("ui.sortable", $.ui.mouse, {
                }
 
                if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-               || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+               || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
                        po = { top: 0, left: 0 };
 
                return {