[Pkg-javascript-commits] [jquery] 01/03: Imported Upstream version 1.12.4
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Jun 17 14:02:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch debian/1.x
in repository jquery.
commit ca11ec5ab815e10f3f0b188102eed2f619df47bc
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Jun 17 10:51:03 2016 -0300
Imported Upstream version 1.12.4
---
.travis.yml | 2 ++
build/release.js | 2 +-
build/release/dist.js | 22 ++++++++++++++++++++--
package.json | 2 +-
src/css.js | 13 -------------
src/css/hiddenVisibleSelectors.js | 8 +++++++-
src/css/support.js | 1 +
test/data/support/reliableHiddenOffsets.html | 22 ++++++++++++++++++++++
test/unit/css.js | 14 +++++++++++++-
test/unit/support.js | 2 +-
10 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 42a302d..34f4d9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
language: node_js
sudo: false
node_js:
+- "0.10"
- "0.12"
- "4"
- "5"
+- "6"
diff --git a/build/release.js b/build/release.js
index 7fd00bd..f3ba4c8 100644
--- a/build/release.js
+++ b/build/release.js
@@ -55,6 +55,6 @@ module.exports = function( Release ) {
module.exports.dependencies = [
"archiver at 0.14.2",
- "shelljs at 0.2.6",
+ "shelljs at 0.7.0",
"npm at 2.3.0"
];
diff --git a/build/release/dist.js b/build/release/dist.js
index 178e38c..ffa6e17 100644
--- a/build/release/dist.js
+++ b/build/release/dist.js
@@ -12,7 +12,6 @@ module.exports = function( Release, complete ) {
// These files are included with the distribution
files = [
"src",
- "external/sizzle",
"LICENSE.txt",
"AUTHORS.txt",
"package.json"
@@ -56,7 +55,22 @@ module.exports = function( Release, complete ) {
function copy() {
// Copy dist files
- var distFolder = Release.dir.dist + "/dist";
+ var distFolder = Release.dir.dist + "/dist",
+ externalFolder = Release.dir.dist + "/external",
+ rmIgnore = [
+ "README.md",
+ "node_modules"
+ ].map( function( file ) {
+ return Release.dir.dist + "/" + file;
+ } );
+
+ shell.config.globOptions = {
+ ignore: rmIgnore
+ };
+
+ // Remove extraneous files before copy
+ shell.rm( "-rf", Release.dir.dist + "/**/*" );
+
shell.mkdir( "-p", distFolder );
[
"dist/jquery.js",
@@ -66,6 +80,10 @@ module.exports = function( Release, complete ) {
shell.cp( "-f", Release.dir.repo + "/" + file, distFolder );
} );
+ // Copy Sizzle
+ shell.mkdir( "-p", externalFolder );
+ shell.cp( "-rf", Release.dir.repo + "/external/sizzle", externalFolder );
+
// Copy other files
files.forEach( function( file ) {
shell.cp( "-rf", Release.dir.repo + "/" + file, Release.dir.dist );
diff --git a/package.json b/package.json
index 85188f4..33fae2c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "jquery",
"title": "jQuery",
"description": "JavaScript library for DOM operations",
- "version": "1.12.3",
+ "version": "1.12.4",
"main": "dist/jquery.js",
"homepage": "http://jquery.com",
"author": {
diff --git a/src/css.js b/src/css.js
index f96600b..e222ce7 100644
--- a/src/css.js
+++ b/src/css.js
@@ -186,19 +186,6 @@ function getWidthOrHeight( elem, name, extra ) {
isBorderBox = support.boxSizing &&
jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
- // Support: IE11 only
- // In IE 11 fullscreen elements inside of an iframe have
- // 100x too small dimensions (gh-1764).
- if ( document.msFullscreenElement && window.top !== window ) {
-
- // Support: IE11 only
- // Running getBoundingClientRect on a disconnected node
- // in IE throws an error.
- if ( elem.getClientRects().length ) {
- val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
- }
- }
-
// some non-html elements return undefined for offsetWidth, so check for null/undefined
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
diff --git a/src/css/hiddenVisibleSelectors.js b/src/css/hiddenVisibleSelectors.js
index 899b9ec..e75ff5f 100644
--- a/src/css/hiddenVisibleSelectors.js
+++ b/src/css/hiddenVisibleSelectors.js
@@ -1,15 +1,21 @@
define( [
"../core",
+ "../var/document",
"./support",
"../selector",
"../css"
-], function( jQuery, support ) {
+], function( jQuery, document, support ) {
function getDisplay( elem ) {
return elem.style && elem.style.display || jQuery.css( elem, "display" );
}
function filterHidden( elem ) {
+
+ // Disconnected elements are considered hidden
+ if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+ return true;
+ }
while ( elem && elem.nodeType === 1 ) {
if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
return true;
diff --git a/src/css/support.js b/src/css/support.js
index fbefc7b..6509df2 100644
--- a/src/css/support.js
+++ b/src/css/support.js
@@ -162,6 +162,7 @@ define( [
if ( reliableHiddenOffsetsVal ) {
div.style.display = "";
div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+ div.childNodes[ 0 ].style.borderCollapse = "separate";
contents = div.getElementsByTagName( "td" );
contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
diff --git a/test/data/support/reliableHiddenOffsets.html b/test/data/support/reliableHiddenOffsets.html
new file mode 100644
index 0000000..b39aaa9
--- /dev/null
+++ b/test/data/support/reliableHiddenOffsets.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <style>
+ table {
+ border-collapse: collapse;
+ border-style: solid;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <script src="../../jquery.js"></script>
+ </div>
+ <script>
+ jQuery(function() {
+ window.parent.iframeCallback( jQuery.support.reliableHiddenOffsets() );
+ });
+ </script>
+</body>
+</html>
diff --git a/test/unit/css.js b/test/unit/css.js
index 58e9e13..e1cfea1 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1059,7 +1059,7 @@ QUnit.test( "css opacity consistency across browsers (#12685)", function( assert
} );
QUnit.test( ":visible/:hidden selectors", function( assert ) {
- assert.expect( 17 );
+ assert.expect( 19 );
var $div, $table, $a;
@@ -1100,8 +1100,20 @@ QUnit.test( ":visible/:hidden selectors", function( assert ) {
$a = jQuery( "<a href='#'><h1>Header</h1></a>" ).appendTo( "#qunit-fixture" );
assert.ok( $a.is( ":visible" ), "Anchor tag with flow content is visible (gh-2227)" );
+
+ assert.ok( !jQuery( "<div>Test</div>" ).is( ":visible" ), "Disconnected element is not visible" );
+ assert.ok( !jQuery( "<div><div>Test</div></div>" ).find("div").is( ":visible" ), "Disconnected element child is not visible" );
} );
+testIframeWithCallback(
+ "Table styles do not affect reliableHiddenOffsets support test (gh-3065)",
+ "support/reliableHiddenOffsets.html",
+ function( testResult, assert ) {
+ assert.expect( 1 );
+
+ assert.equal( testResult, jQuery.support.reliableHiddenOffsets(), "reliableHiddenOffsets value not affected by table styles" );
+ } );
+
QUnit.test( "Keep the last style if the new one isn't recognized by the browser (#14836)", function( assert ) {
assert.expect( 2 );
diff --git a/test/unit/support.js b/test/unit/support.js
index 46f4871..b490190 100644
--- a/test/unit/support.js
+++ b/test/unit/support.js
@@ -416,7 +416,7 @@ testIframeWithCallback(
"submit": true,
"tbody": true
};
- } else if ( /9\.0(\.\d+|) safari/i.test( userAgent ) ) {
+ } else if ( /\b9\.\d(\.\d+)* safari/i.test( userAgent ) ) {
expected = {
"ajax": true,
"appendChecked": true,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/jquery.git
More information about the Pkg-javascript-commits
mailing list