aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2016-03-23 14:16:38 +0100
committerMichał Gołębiowski <m.goleb@gmail.com>2016-03-30 11:21:36 +0200
commit622db29d9c1aed1e51586db72861a1aab4d7606f (patch)
treeab7cef568f4300d1b8038438d474c5944e081e5b
parent44cb97e0cfc8d3e62bef7c621bfeba6fe4f65d7c (diff)
downloadjquery-622db29d9c1aed1e51586db72861a1aab4d7606f.tar.gz
jquery-622db29d9c1aed1e51586db72861a1aab4d7606f.zip
Docs:Tests: Remove legacy code & add support comments where needed
This commits backports some changes done in the patch to the then-existing compat branch that removed support for old browsers and added some support comments. Refs 90d7cc1d8b2ea7ac75f0eacb42439349c9c73278
-rw-r--r--src/attributes/val.js1
-rw-r--r--test/data/css/cssWidthBeforeDocReady.html1
-rw-r--r--test/unit/css.js38
-rw-r--r--test/unit/effects.js50
-rw-r--r--test/unit/event.js1
-rw-r--r--test/unit/wrap.js2
6 files changed, 38 insertions, 55 deletions
diff --git a/src/attributes/val.js b/src/attributes/val.js
index a8a2e12fb..1338fcdf6 100644
--- a/src/attributes/val.js
+++ b/src/attributes/val.js
@@ -108,6 +108,7 @@ jQuery.extend( {
for ( ; i < max; i++ ) {
option = options[ i ];
+ // Support: IE <=9 only
// IE8-9 doesn't update selected after form reset (#2551)
if ( ( option.selected || i === index ) &&
diff --git a/test/data/css/cssWidthBeforeDocReady.html b/test/data/css/cssWidthBeforeDocReady.html
index 12e954dc0..a8fa4af0f 100644
--- a/test/data/css/cssWidthBeforeDocReady.html
+++ b/test/data/css/cssWidthBeforeDocReady.html
@@ -4,7 +4,6 @@
<meta charset="utf-8">
<style>
#test {
- -webkit-box-sizing: border-box;
box-sizing: border-box;
width: 100px;
height: 100px;
diff --git a/test/unit/css.js b/test/unit/css.js
index 43ce6ae19..c82d8c203 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -58,9 +58,9 @@ QUnit.test( "css(String|Hash)", function( assert ) {
jQuery( "#foo" ).css( { "opacity": "" } );
assert.equal( jQuery( "#foo" ).css( "opacity" ), "1", "Assert opacity is 1 when set to an empty String" );
- assert.equal( jQuery( "#empty" ).css( "opacity" ), "0", "Assert opacity is accessible via filter property set in stylesheet in IE" );
+ assert.equal( jQuery( "#empty" ).css( "opacity" ), "0", "Assert opacity is accessible" );
jQuery( "#empty" ).css( { "opacity": "1" } );
- assert.equal( jQuery( "#empty" ).css( "opacity" ), "1", "Assert opacity is taken from style attribute when set vs stylesheet in IE with filters" );
+ assert.equal( jQuery( "#empty" ).css( "opacity" ), "1", "Assert opacity is taken from style attribute when set" );
div = jQuery( "#nothiddendiv" );
child = jQuery( "#nothiddendivchild" );
@@ -478,7 +478,7 @@ QUnit.test( "show()", function( assert ) {
assert.expect( 18 );
- var hiddendiv, div, pass, old, test;
+ var hiddendiv, div, pass, test;
hiddendiv = jQuery( "div.hidden" );
assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" );
@@ -504,13 +504,9 @@ QUnit.test( "show()", function( assert ) {
"<div id='show-tests'>" +
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
- "<ul><li></li></ul></div>" +
- "<table id='test-table'></table>"
+ "<ul><li></li></ul></div>"
).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
- old = jQuery( "#test-table" ).show().css( "display" ) !== "table";
- jQuery( "#test-table" ).remove();
-
test = {
"div": "block",
"p": "block",
@@ -518,14 +514,14 @@ QUnit.test( "show()", function( assert ) {
"code": "inline",
"pre": "block",
"span": "inline",
- "table": old ? "block" : "table",
- "thead": old ? "block" : "table-header-group",
- "tbody": old ? "block" : "table-row-group",
- "tr": old ? "block" : "table-row",
- "th": old ? "block" : "table-cell",
- "td": old ? "block" : "table-cell",
+ "table": "table",
+ "thead": "table-header-group",
+ "tbody": "table-row-group",
+ "tr": "table-row",
+ "th": "table-cell",
+ "td": "table-cell",
"ul": "block",
- "li": old ? "block" : "list-item"
+ "li": "list-item"
};
jQuery.each( test, function( selector, expected ) {
@@ -1234,23 +1230,21 @@ QUnit.test( "cssHooks - expand", function( assert ) {
} );
QUnit.test( "css opacity consistency across browsers (#12685)", function( assert ) {
- assert.expect( 4 );
+ assert.expect( 3 );
var el,
fixture = jQuery( "#qunit-fixture" );
// Append style element
- jQuery( "<style>.opacityWithSpaces_t12685 { opacity: 0.1; filter: alpha(opacity = 10); } .opacityNoSpaces_t12685 { opacity: 0.2; filter: alpha(opacity=20); }</style>" ).appendTo( fixture );
+ jQuery( "<style>.opacity_t12685 { opacity: 0.1; }</style>" ).appendTo( fixture );
- el = jQuery( "<div class='opacityWithSpaces_t12685'></div>" ).appendTo( fixture );
+ el = jQuery( "<div class='opacity_t12685'></div>" ).appendTo( fixture );
- assert.equal( Math.round( el.css( "opacity" ) * 100 ), 10, "opacity from style sheet (filter:alpha with spaces)" );
- el.removeClass( "opacityWithSpaces_t12685" ).addClass( "opacityNoSpaces_t12685" );
- assert.equal( Math.round( el.css( "opacity" ) * 100 ), 20, "opacity from style sheet (filter:alpha without spaces)" );
+ assert.equal( Math.round( el.css( "opacity" ) * 100 ), 10, "opacity from style sheet" );
el.css( "opacity", 0.3 );
assert.equal( Math.round( el.css( "opacity" ) * 100 ), 30, "override opacity" );
el.css( "opacity", "" );
- assert.equal( Math.round( el.css( "opacity" ) * 100 ), 20, "remove opacity override" );
+ assert.equal( Math.round( el.css( "opacity" ) * 100 ), 10, "remove opacity override" );
} );
QUnit[ jQuery.find.compile ? "test" : "skip" ]( ":visible/:hidden selectors", function( assert ) {
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 2f0ac9334..653db6431 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -50,7 +50,7 @@ QUnit.test( "show() basic", function( assert ) {
QUnit.test( "show()", function( assert ) {
assert.expect( 27 );
- var div, speeds, old, test,
+ var div, speeds, test,
hiddendiv = jQuery( "div.hidden" );
assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" );
@@ -99,13 +99,9 @@ QUnit.test( "show()", function( assert ) {
"<div id='show-tests'>" +
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
- "<ul><li></li></ul></div>" +
- "<table id='test-table'></table>"
+ "<ul><li></li></ul></div>"
).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
- old = jQuery( "#test-table" ).show().css( "display" ) !== "table";
- jQuery( "#test-table" ).remove();
-
test = {
"div": "block",
"p": "block",
@@ -113,14 +109,14 @@ QUnit.test( "show()", function( assert ) {
"code": "inline",
"pre": "block",
"span": "inline",
- "table": old ? "block" : "table",
- "thead": old ? "block" : "table-header-group",
- "tbody": old ? "block" : "table-row-group",
- "tr": old ? "block" : "table-row",
- "th": old ? "block" : "table-cell",
- "td": old ? "block" : "table-cell",
+ "table": "table",
+ "thead": "table-header-group",
+ "tbody": "table-row-group",
+ "tr": "table-row",
+ "th": "table-cell",
+ "td": "table-cell",
"ul": "block",
- "li": old ? "block" : "list-item"
+ "li": "list-item"
};
jQuery.each( test, function( selector, expected ) {
@@ -144,34 +140,28 @@ supportjQuery.each( hideOptions, function( type, setup ) {
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody>" +
"</table>" +
- "<ul><li></li></ul></div>" +
- "<table id='test-table'></table>"
+ "<ul><li></li></ul></div>"
).appendTo( "#qunit-fixture" ).find( "*" ).each( setup );
- var test,
- old = jQuery( "#test-table" ).show().css( "display" ) !== "table";
-
- jQuery( "#test-table" ).remove();
-
// Note: inline elements are expected to be inline-block
// because we're showing width/height
// Can't animate width/height inline
// See #14344
- test = {
+ var test = {
"div": "block",
"p": "block",
"a": "inline",
"code": "inline",
"pre": "block",
"span": "inline",
- "table": old ? "block" : "table",
- "thead": old ? "block" : "table-header-group",
- "tbody": old ? "block" : "table-row-group",
- "tr": old ? "block" : "table-row",
- "th": old ? "block" : "table-cell",
- "td": old ? "block" : "table-cell",
+ "table": "table",
+ "thead": "table-header-group",
+ "tbody": "table-row-group",
+ "tr": "table-row",
+ "th": "table-cell",
+ "td": "table-cell",
"ul": "block",
- "li": old ? "block" : "list-item"
+ "li": "list-item"
};
jQuery.each( test, function( selector ) {
@@ -369,10 +359,8 @@ QUnit.test( "animate block width/height", function( assert ) {
QUnit.test( "animate table width/height", function( assert ) {
assert.expect( 1 );
- var displayMode = jQuery( "#table" ).css( "display" ) !== "table" ? "block" : "table";
-
jQuery( "#table" ).animate( { width: 42, height: 42 }, 100, function() {
- assert.equal( jQuery( this ).css( "display" ), displayMode, "display mode is correct" );
+ assert.equal( jQuery( this ).css( "display" ), "table", "display mode is correct" );
} );
this.clock.tick( 100 );
} );
diff --git a/test/unit/event.js b/test/unit/event.js
index 63b367ea8..33393c835 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -2920,6 +2920,7 @@ if ( !( /firefox/i.test( window.navigator.userAgent ) ) ) {
$text = jQuery( "#text1" ),
$radio = jQuery( "#radio1" ).trigger( "focus" );
+ // Support: IE <=10 only
// IE8-10 fire focus/blur events asynchronously; this is the resulting mess.
// IE's browser window must be topmost for this to work properly!!
QUnit.stop();
diff --git a/test/unit/wrap.js b/test/unit/wrap.js
index 80abd9e87..02994bafa 100644
--- a/test/unit/wrap.js
+++ b/test/unit/wrap.js
@@ -60,7 +60,7 @@ function testWrap( val, assert ) {
j.wrap( val( "<i></i>" ) );
assert.equal(
- jQuery( "#nonnodes > i" ).length, jQuery( "#nonnodes" )[ 0 ].childNodes.length,
+ jQuery( "#nonnodes > i" ).length, 3,
"Check node,textnode,comment wraps ok"
);
assert.equal(