Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 3d6f1d5

Browse files
committed
Update jQuery for spec runner
1 parent 3449393 commit 3d6f1d5

3 files changed

Lines changed: 11 additions & 18 deletions

File tree

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = function(grunt) {
4343
"--local-to-remote-url-access": true,
4444
specs: ["test/spec/*.js"],
4545
helpers: ["test/testprops.js"],
46-
vendor: ["libs/jquery-1.12.3.js", "libs/bluebird-3.4.0.js"]
46+
vendor: ["libs/jquery-1.12.4.js", "libs/bluebird-3.4.0.js"]
4747
}
4848
}
4949
});
Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v1.12.3
2+
* jQuery JavaScript Library v1.12.4
33
* http://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* http://jquery.org/license
1111
*
12-
* Date: 2016-04-05T19:16Z
12+
* Date: 2016-05-20T17:17Z
1313
*/
1414

1515
(function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
6565

6666

6767
var
68-
version = "1.12.3",
68+
version = "1.12.4",
6969

7070
// Define a local copy of jQuery
7171
jQuery = function( selector, context ) {
@@ -6672,6 +6672,7 @@ var documentElement = document.documentElement;
66726672
if ( reliableHiddenOffsetsVal ) {
66736673
div.style.display = "";
66746674
div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
6675+
div.childNodes[ 0 ].style.borderCollapse = "separate";
66756676
contents = div.getElementsByTagName( "td" );
66766677
contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
66776678
reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
@@ -6996,19 +6997,6 @@ function getWidthOrHeight( elem, name, extra ) {
69966997
isBorderBox = support.boxSizing &&
69976998
jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
69986999

6999-
// Support: IE11 only
7000-
// In IE 11 fullscreen elements inside of an iframe have
7001-
// 100x too small dimensions (gh-1764).
7002-
if ( document.msFullscreenElement && window.top !== window ) {
7003-
7004-
// Support: IE11 only
7005-
// Running getBoundingClientRect on a disconnected node
7006-
// in IE throws an error.
7007-
if ( elem.getClientRects().length ) {
7008-
val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
7009-
}
7010-
}
7011-
70127000
// some non-html elements return undefined for offsetWidth, so check for null/undefined
70137001
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
70147002
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
@@ -9999,6 +9987,11 @@ function getDisplay( elem ) {
99999987
}
100009988

100019989
function filterHidden( elem ) {
9990+
9991+
// Disconnected elements are considered hidden
9992+
if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
9993+
return true;
9994+
}
100029995
while ( elem && elem.nodeType === 1 ) {
100039996
if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
100049997
return true;

test/SpecRunner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<script type="text/javascript" src="../libs/jasmine-2.4.1/jasmine-html.js"></script>
1212
<script type="text/javascript" src="../libs/jasmine-2.4.1/boot.js"></script>
1313

14-
<script type="text/javascript" src="../libs/jquery-1.12.3.js"></script>
14+
<script type="text/javascript" src="../libs/jquery-1.12.4.js"></script>
1515
<script type="text/javascript" src="../libs/bluebird-3.4.0.js"></script>
1616
<script type="text/javascript" src="../dist/EVEoj.js"></script>
1717

0 commit comments

Comments
 (0)