library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc: Fix the tests, revert some unneeded/broken reverts

Browse Source 
Refs 65d71843b7
This commit is contained in:
Michał Gołębiowski 2015-11-16 21:55:08 +01:00
parent 65d71843b7
commit 1ad9915d11
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/css/curCSS.js
View File

@ -5,7 +5,7 @@ define( [
"./var/getStyles", "./var/getStyles",
"./support", "./support",
"../selector" // Get jQuery.contains "../selector" // Get jQuery.contains
], function( jQuery, rnumnonpx, rmargin, getStyles ) { ], function( jQuery, rnumnonpx, rmargin, getStyles, support ) {
function curCSS( elem, name, computed ) { function curCSS( elem, name, computed ) {
var width, minWidth, maxWidth, ret, var width, minWidth, maxWidth, ret,
@ -22,13 +22,12 @@ function curCSS( elem, name, computed ) {
ret = jQuery.style( elem, name ); ret = jQuery.style( elem, name );
} }
// Support: iOS < 6, Android 4.0-4.3 only
// A tribute to the "awesome hack by Dean Edwards" // A tribute to the "awesome hack by Dean Edwards"
// iOS < 6 (at least) returns percentage for a larger set of values, // Android Browser returns percentage for some values,
// but width seems to be reliably pixels // but width seems to be reliably pixels.
// this is against the CSSOM draft spec: // This is against the CSSOM draft spec:
// http://dev.w3.org/csswg/cssom/#resolved-values // http://dev.w3.org/csswg/cssom/#resolved-values
if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
// Remember the original values // Remember the original values
width = style.width; width = style.width;

8
src/css/hiddenVisibleSelectors.js
View File

@ -4,15 +4,15 @@ define( [
], function( jQuery ) { ], function( jQuery ) {
jQuery.expr.filters.hidden = function( elem ) { jQuery.expr.filters.hidden = function( elem ) {
return !jQuery.expr.filters.visible( elem );
};
jQuery.expr.filters.visible = function( elem ) {
// Support: Opera <= 12.12 // Support: Opera <= 12.12
// Opera reports offsetWidths and offsetHeights less than zero on some elements // Opera reports offsetWidths and offsetHeights less than zero on some elements
// Use OR instead of AND as the element is not visible if either is true // Use OR instead of AND as the element is not visible if either is true
// See tickets #10406 and #13132 // See tickets #10406 and #13132
return elem.offsetWidth <= 0 || elem.offsetHeight <= 0; return elem.offsetWidth > 0 || elem.offsetHeight > 0 || elem.getClientRects().length > 0;
};
jQuery.expr.filters.visible = function( elem ) {
return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
}; };
} ); } );

7
src/css/support.js
View File

@ -32,9 +32,10 @@ define( [
// Support: Firefox<29, Android 2.3 // Support: Firefox<29, Android 2.3
// Vendor-prefix box-sizing // Vendor-prefix box-sizing
"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" + "-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;" +
"box-sizing:border-box;display:block;margin-top:1%;top:1%;" + "position:relative;display:block;" +
"border:1px;padding:1px;width:4px;position:absolute"; "margin:auto;border:1px;padding:1px;" +
"top:1%;width:50%";
div.innerHTML = ""; div.innerHTML = "";
documentElement.appendChild( container ); documentElement.appendChild( container );

6
src/offset.js
View File

@ -98,11 +98,7 @@ jQuery.fn.extend( {
return box; return box;
} }
// Support: BlackBerry 5, iOS 3 (original iPhone) box = elem.getBoundingClientRect();
// If we don't have gBCR, just use 0,0 rather than error
if ( elem.getBoundingClientRect ) {
box = elem.getBoundingClientRect();
}
win = getWindow( doc ); win = getWindow( doc );
return { return {
top: box.top + win.pageYOffset - docElem.clientTop, top: box.top + win.pageYOffset - docElem.clientTop,

4
test/unit/dimensions.js
View File

@ -411,8 +411,8 @@ QUnit.test( "setters with and without box-sizing:border-box", function( assert )
// Support: Firefox<29, Android 2.3 (Prefixed box-sizing versions). // Support: Firefox<29, Android 2.3 (Prefixed box-sizing versions).
var parent = jQuery( "#foo" ).css( { width: "200px", height: "200px", "font-size": "16px" } ), var parent = jQuery( "#foo" ).css( { width: "200px", height: "200px", "font-size": "16px" } ),
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( parent ), el_bb = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;'></div>" ).appendTo( parent ),
el = jQuery( "<div style='width:100px;height:100px;margin:5px;padding:3px;border:4px solid white;'>test</div>" ).appendTo( parent ); el = jQuery( "<div style='margin:5px;padding:1px;border:2px solid black;'></div>" ).appendTo( parent );
jQuery.each( { jQuery.each( {
"number": { set: 100, expected: 100 }, "number": { set: 100, expected: 100 },