diff options
author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-04-04 22:04:39 +0200 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2013-04-06 17:09:52 -0400 |
commit | dca7681284731053124e6437c5bec58e030cc91d (patch) | |
tree | 6646d538c7866f9336f2ac11a6e181b616a5632f /test | |
parent | 1b610266502490eab42a0b9ddfac2f93da0b0fe1 (diff) | |
download | jquery-dca7681284731053124e6437c5bec58e030cc91d.tar.gz jquery-dca7681284731053124e6437c5bec58e030cc91d.zip |
Improve CSS and `Support:` comments. Close gh-1220.
1) corrected box-sizing rules order - the unprefixed value should always be the last one
2) removed last semi-colons in CSS rules
3) updated support comments
code review changes + more consistent comment spacing
Diffstat (limited to 'test')
-rw-r--r-- | test/unit/ajax.js | 1 | ||||
-rw-r--r-- | test/unit/css.js | 3 | ||||
-rw-r--r-- | test/unit/dimensions.js | 3 | ||||
-rw-r--r-- | test/unit/offset.js | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js index a0a2abf4a..0de0da05f 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -1045,7 +1045,6 @@ module( "ajax", { ok( jqXHR.statusText === "Hello" || jqXHR.statusText === "OK", "jqXHR status text ok for success (" + jqXHR.statusText + ")" ); jQuery.ajax( url("data/statusText.php?status=404&text=World") ).fail(function( jqXHR, statusText ) { strictEqual( statusText, "error", "callback status text ok for error" ); - // ok( jqXHR.statusText === "World" || jQuery.browser.safari && jqXHR.statusText === "Not Found", "jqXHR status text ok for error (" + jqXHR.statusText + ")" ); start(); }); }); diff --git a/test/unit/css.js b/test/unit/css.js index dc851f745..8a2ecfb60 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -775,7 +775,8 @@ test("Do not append px (#9548, #12990)", function() { test("css('width') and css('height') should respect box-sizing, see #11004", function() { expect( 4 ); - var el_dis = jQuery("<div style='width:300px;height:300px;margin:2px;padding:2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;'>test</div>"), + // Support: Firefox, Android 2.3 (Prefixed box-sizing versions). + var el_dis = jQuery("<div style='width:300px;height:300px;margin:2px;padding:2px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;'>test</div>"), el = el_dis.clone().appendTo("#qunit-fixture"); equal( el.css("width"), el.css("width", el.css("width")).css("width"), "css('width') is not respecting box-sizing, see #11004"); diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js index bcb7b7f2c..c7d1281f2 100644 --- a/test/unit/dimensions.js +++ b/test/unit/dimensions.js @@ -407,7 +407,8 @@ test( "getters on non elements should return null", function() { test("setters with and without box-sizing:border-box", function(){ expect(20); - var el_bb = jQuery("<div style='width:114px;height:114px;margin:5px;padding:3px;border:4px solid white;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;'>test</div>").appendTo("#qunit-fixture"), + // Support: Firefox, Android 2.3 (Prefixed box-sizing versions). + var el_bb = jQuery("<div style='width:114px;height:114px;margin:5px;padding:3px;border:4px solid white;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;'>test</div>").appendTo("#qunit-fixture"), el = jQuery("<div style='width:100px;height:100px;margin:5px;padding:3px;border:4px solid white;'>test</div>").appendTo("#qunit-fixture"), expected = 100; diff --git a/test/unit/offset.js b/test/unit/offset.js index 08b90c3b8..0d8bcc726 100644 --- a/test/unit/offset.js +++ b/test/unit/offset.js @@ -18,8 +18,7 @@ var supportsScroll, supportsFixedPosition, supportsScroll = document.documentElement.scrollTop || document.body.scrollTop; forceScroll.detach(); - // Safari subtracts parent border width here (which is 5px) - supportsFixedPosition = checkFixed[0].offsetTop === 20 || checkFixed[0].offsetTop === 15; + supportsFixedPosition = checkFixed[0].offsetTop === 20; checkFixed.remove(); }; |