From 7049877530882c2f8ee09f71f7fc736ca9570736 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Wed, 20 Mar 2013 01:45:19 +0100 Subject: [PATCH] Correct oldIE-related comments, revert some workarounds. Close gh-1207. --- CONTRIBUTING.md | 6 ++++-- src/ajax.js | 2 +- src/attributes.js | 9 +++------ src/core.js | 8 +------- src/effects.js | 2 +- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6028db34d..e6ede8e10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -207,10 +207,12 @@ This will only run the "css" module tests. This will significantly speed up your **ALWAYS RUN THE FULL SUITE BEFORE COMMITTING AND PUSHING A PATCH!** -### jQuery supports the following browsers: +### jQuery 2.x supports the following browsers: * Chrome Current-1 * Safari Current-1 * Firefox Current-1 -* IE 6+ +* IE 9+ * Opera Current-1 + +jQuery 1.x additionally supports IE6+. diff --git a/src/ajax.js b/src/ajax.js index e965a3e8a..62c3d8ae1 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -8,7 +8,7 @@ var ajax_rquery = /\?/, rhash = /#.*$/, rts = /([?&])_=[^&]*/, - rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL + rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg, // #7653, #8125, #8152: local protocol detection rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, rnoContent = /^(?:GET|HEAD)$/, diff --git a/src/attributes.js b/src/attributes.js index 665e6ba9d..f116f8396 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -23,11 +23,8 @@ jQuery.fn.extend({ removeProp: function( name ) { name = jQuery.propFix[ name ] || name; return this.each(function() { - // try/catch handles cases where IE balks (such as removing a property on window) - try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} + this[ name ] = undefined; + delete this[ name ]; }); }, @@ -249,7 +246,7 @@ jQuery.extend({ for ( ; i < max; i++ ) { option = options[ i ]; - // oldIE doesn't update selected after form reset (#2551) + // IE6-9 doesn't update selected after form reset (#2551) if ( ( option.selected || i === index ) && // Don't return options that are disabled or in a disabled optgroup ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && diff --git a/src/core.js b/src/core.js index 67fa24c77..9a288fa1b 100644 --- a/src/core.js +++ b/src/core.js @@ -133,13 +133,7 @@ jQuery.fn = jQuery.prototype = { // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object + // Inject the element directly into the jQuery object this.length = 1; this[0] = elem; } diff --git a/src/effects.js b/src/effects.js index 96370920b..8a2f2a26c 100644 --- a/src/effects.js +++ b/src/effects.js @@ -279,7 +279,7 @@ function defaultPrefilter( elem, props, opts ) { // height/width overflow pass if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) { // Make sure that nothing sneaks out - // Record all 3 overflow attributes because IE does not + // Record all 3 overflow attributes because IE9-10 do not // change the overflow attribute when overflowX and // overflowY are set to the same value opts.overflow = [ style.overflow, style.overflowX, style.overflowY ]; -- 2.39.5