aboutsummaryrefslogtreecommitdiffstats
path: root/src/css
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2014-09-11 15:18:34 -0500
committerMichał Gołębiowski <m.goleb@gmail.com>2014-12-26 13:26:46 +0100
commit76df9e4e389d80bff410a9e5f08b848de1d21a2f (patch)
tree215a453aac2f1cc5574f66173e91d391493146d3 /src/css
parentab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1 (diff)
downloadjquery-76df9e4e389d80bff410a9e5f08b848de1d21a2f.tar.gz
jquery-76df9e4e389d80bff410a9e5f08b848de1d21a2f.zip
Build: Don't assume the browser environment; smoke test on Node w/ jsdom
Fixes gh-1950 Closes gh-1949
Diffstat (limited to 'src/css')
-rw-r--r--src/css/defaultDisplay.js3
-rw-r--r--src/css/support.js13
2 files changed, 9 insertions, 7 deletions
diff --git a/src/css/defaultDisplay.js b/src/css/defaultDisplay.js
index a6f60d17e..3771be6d1 100644
--- a/src/css/defaultDisplay.js
+++ b/src/css/defaultDisplay.js
@@ -1,7 +1,8 @@
define([
"../core",
+ "../var/document",
"../manipulation" // appendTo
-], function( jQuery ) {
+], function( jQuery, document ) {
var iframe,
elemdisplay = {
diff --git a/src/css/support.js b/src/css/support.js
index 0adb5f325..ffe3ed9bb 100644
--- a/src/css/support.js
+++ b/src/css/support.js
@@ -1,11 +1,12 @@
define([
"../core",
+ "../var/document",
+ "../var/documentElement",
"../var/support"
-], function( jQuery, support ) {
+], function( jQuery, document, documentElement, support ) {
(function() {
var pixelPositionVal, boxSizingReliableVal,
- docElem = document.documentElement,
container = document.createElement( "div" ),
div = document.createElement( "div" );
@@ -33,13 +34,13 @@ define([
"display:block;margin-top:1%;top:1%;" +
"border:1px;padding:1px;width:4px;position:absolute";
div.innerHTML = "";
- docElem.appendChild( container );
+ documentElement.appendChild( container );
var divStyle = window.getComputedStyle( div, null );
pixelPositionVal = divStyle.top !== "1%";
boxSizingReliableVal = divStyle.width === "4px";
- docElem.removeChild( container );
+ documentElement.removeChild( container );
}
// Support: node.js jsdom
@@ -78,11 +79,11 @@ define([
"display:block;margin:0;border:0;padding:0";
marginDiv.style.marginRight = marginDiv.style.width = "0";
div.style.width = "1px";
- docElem.appendChild( container );
+ documentElement.appendChild( container );
ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
- docElem.removeChild( container );
+ documentElement.removeChild( container );
div.removeChild( marginDiv );
return ret;