diff --git a/src/overlay/overlay.js b/src/overlay/overlay.js index 1954251..d53e1a4 100644 --- a/src/overlay/overlay.js +++ b/src/overlay/overlay.js @@ -28,7 +28,7 @@ effect: 'default', // since 1.2. fixed positioning not supported by IE6 - fixed: !$.browser.msie || $.browser.version > 6, + fixed: !$('html').hasClass('ie6'), left: 'center', load: false, // 1.2 @@ -137,8 +137,8 @@ // position & dimensions var top = conf.top, left = conf.left, - oWidth = overlay.outerWidth({margin:true}), - oHeight = overlay.outerHeight({margin:true}); + oWidth = overlay.outerWidth(true), + oHeight = overlay.outerHeight(true); if (typeof top == 'string') { top = top == 'center' ? Math.max((w.height() - oHeight) / 2, 0) : diff --git a/src/toolbox/toolbox.expose.js b/src/toolbox/toolbox.expose.js index 2859e45..43627e1 100644 --- a/src/toolbox/toolbox.expose.js +++ b/src/toolbox/toolbox.expose.js @@ -41,7 +41,7 @@ function viewport() { // the horror case - if ($.browser.msie) { + if ($('html').hasClass('oldie')) { // if there are no scrollbars then use window.height var d = $(document).height(), w = $(window).height(); diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js index ffe1047..9e5ed9b 100644 --- a/src/tooltip/tooltip.js +++ b/src/tooltip/tooltip.js @@ -69,7 +69,7 @@ fade: [ function(done) { var conf = this.getConf(); - if (!$.browser.msie || conf.fadeIE) { + if (!$('html').hasClass('oldie') || conf.fadeIE) { this.getTip().fadeTo(conf.fadeInSpeed, conf.opacity, done); } else { @@ -79,7 +79,7 @@ }, function(done) { var conf = this.getConf(); - if (!$.browser.msie || conf.fadeIE) { + if (!$('html').hasClass('oldie') || conf.fadeIE) { this.getTip().fadeOut(conf.fadeOutSpeed, done); } else { @@ -100,8 +100,8 @@ left = conf.relative ? trigger.position().left : trigger.offset().left, pos = conf.position[0]; - top -= tip.outerHeight() - conf.offset[0]; - left += trigger.outerWidth() + conf.offset[1]; + top -= tip.outerHeight(false) - conf.offset[0]; + left += trigger.outerWidth(false) + conf.offset[1]; // iPad position fix if (/iPad/i.test(navigator.userAgent)) { @@ -109,14 +109,14 @@ } // adjust Y - var height = tip.outerHeight() + trigger.outerHeight(); + var height = tip.outerHeight(false) + trigger.outerHeight(false); if (pos == 'center') { top += height / 2; } if (pos == 'bottom') { top += height; } // adjust X pos = conf.position[1]; - var width = tip.outerWidth() + trigger.outerWidth(); + var width = tip.outerWidth(false) + trigger.outerWidth(false); if (pos == 'center') { left -= width / 2; } if (pos == 'left') { left -= width; } diff --git a/src/tooltip/tooltip.slide.js b/src/tooltip/tooltip.slide.js index e5aad5c..3af131a 100644 --- a/src/tooltip/tooltip.slide.js +++ b/src/tooltip/tooltip.slide.js @@ -21,7 +21,7 @@ slideOffset: 10, slideInSpeed: 200, slideOutSpeed: 200, - slideFade: !$.browser.msie + slideFade: !$('html').hasClass('oldie') }); // directions for slide effect