aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/data/event/focusElem.html18
-rw-r--r--test/data/support/boxSizing.html18
-rw-r--r--test/data/testsuite.css80
-rw-r--r--test/unit/queue.js7
4 files changed, 61 insertions, 62 deletions
diff --git a/test/data/event/focusElem.html b/test/data/event/focusElem.html
index eed082c1a..10726b4ff 100644
--- a/test/data/event/focusElem.html
+++ b/test/data/event/focusElem.html
@@ -1,16 +1,16 @@
<!doctype html>
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <title>.focus() (activeElement access #13393)</title>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+ <title>.focus() (activeElement access #13393)</title>
- <script src="../../jquery.js"></script>
+ <script src="../../jquery.js"></script>
</head>
<body>
- <a href="#" id="frame-link"></a>
- <script>
- jQuery("#frame-link").focus();
- window.parent.iframeCallback( true );
- </script>
+ <a href="#" id="frame-link"></a>
+ <script>
+ jQuery("#frame-link").focus();
+ window.parent.iframeCallback( true );
+ </script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/test/data/support/boxSizing.html b/test/data/support/boxSizing.html
index 2da883dc6..63c4c90b7 100644
--- a/test/data/support/boxSizing.html
+++ b/test/data/support/boxSizing.html
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <style>
- body {
- zoom: 0.87;
- }
- </style>
+ <meta charset="utf-8">
+ <style>
+ body {
+ zoom: 0.87;
+ }
+ </style>
</head>
<body>
<script src="../../jquery.js"></script>
<script>
- jQuery(function() {
- window.parent.iframeCallback( jQuery.support.boxSizing );
- });
+ jQuery(function() {
+ window.parent.iframeCallback( jQuery.support.boxSizing );
+ });
</script>
</body>
</html>
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index 1dfa7cd34..134993c01 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -1,127 +1,127 @@
/* for testing opacity set in styles in IE */
ol#empty {
- opacity: 0;
- filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff');
+ opacity: 0;
+ filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff');
}
div#fx-tests h4 {
- background: red;
+ background: red;
}
div#fx-tests h4.pass {
- background: green;
+ background: green;
}
div#fx-tests div.box {
- background: red;
- overflow: hidden;
- border: 2px solid #000;
+ background: red;
+ overflow: hidden;
+ border: 2px solid #000;
}
div#fx-tests div.overflow {
- overflow: visible;
+ overflow: visible;
}
div.inline {
- display: inline;
+ display: inline;
}
div.autoheight {
- height: auto;
+ height: auto;
}
div.autowidth {
- width: auto;
+ width: auto;
}
div.autoopacity {
- opacity: auto;
+ opacity: auto;
}
div.largewidth {
- width: 100px;
+ width: 100px;
}
div.largeheight {
- height: 100px;
+ height: 100px;
}
div.largeopacity {
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100);
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100);
}
div.medwidth {
- width: 50px;
+ width: 50px;
}
div.medheight {
- height: 50px;
+ height: 50px;
}
div.medopacity {
- opacity: 0.5;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50);
+ opacity: 0.5;
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50);
}
div.nowidth {
- width: 0px;
+ width: 0px;
}
div.noheight {
- height: 0px;
+ height: 0px;
}
div.noopacity {
- opacity: 0;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+ opacity: 0;
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
}
div.hidden {
- display: none;
+ display: none;
}
div#fx-tests div.widewidth {
- background-repeat: repeat-x;
+ background-repeat: repeat-x;
}
div#fx-tests div.wideheight {
- background-repeat: repeat-y;
+ background-repeat: repeat-y;
}
div#fx-tests div.widewidth.wideheight {
- background-repeat: repeat;
+ background-repeat: repeat;
}
div#fx-tests div.noback {
- background-image: none;
+ background-image: none;
}
.chain-test,
.chain-test div {
- width: 100px;
- height: 20px;
- position: relative;
- float: left;
+ width: 100px;
+ height: 20px;
+ position: relative;
+ float: left;
}
.chain-test div {
- position: absolute;
- top: 0;
- left: 0;
+ position: absolute;
+ top: 0;
+ left: 0;
}
.chain-test {
- background: red;
+ background: red;
}
.chain-test div {
- background: green;
+ background: green;
}
.chain-test-out {
- background: green;
+ background: green;
}
.chain-test-out div {
- background: red;
- display: none;
+ background: red;
+ display: none;
}
/* tests to ensure jQuery can determine the native display mode of elements
diff --git a/test/unit/queue.js b/test/unit/queue.js
index 81eefc175..cfdf47d21 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -3,8 +3,7 @@ module( "queue", { teardown: moduleTeardown });
test( "queue() with other types", 14, function() {
stop();
- var defer,
- $div = jQuery({}),
+ var $div = jQuery({}),
counter = 0;
$div.promise( "foo" ).done(function() {
@@ -27,7 +26,7 @@ test( "queue() with other types", 14, function() {
equal( ++counter, 4, "Dequeuing" );
});
- defer = $div.promise("foo").done(function() {
+ $div.promise("foo").done(function() {
equal( counter, 4, "Testing previous call to dequeue in deferred" );
start();
});
@@ -183,7 +182,7 @@ test("clearQueue() clears the fx queue", function() {
});
asyncTest( "fn.promise() - called when fx queue is empty", 3, function() {
- var foo = jQuery( "#foo" ).clone().andSelf(),
+ var foo = jQuery( "#foo" ).clone().addBack(),
promised = false;
foo.queue( function( next ) {