Commit 69866fd2 authored by timmywil's avatar timmywil

VML.type test was causing multiple test suite fails, fix attributes.js fail in...

VML.type test was causing multiple test suite fails, fix attributes.js fail in IE6 where the val(String/Number) tests were interfering with the val(Function) tests
parent 6d49e84d
...@@ -109,3 +109,6 @@ div#show-tests * { display: none; } ...@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
#nothiddendiv { font-size: 16px; } #nothiddendiv { font-size: 16px; }
#nothiddendivchild.em { font-size: 2em; } #nothiddendivchild.em { font-size: 2em; }
#nothiddendivchild.prct { font-size: 150%; } #nothiddendivchild.prct { font-size: 150%; }
/* For testing type on vml in IE #7071 */
v\:oval { behavior:url(#default#VML); display:inline-block; }
\ No newline at end of file
...@@ -45,10 +45,6 @@ ...@@ -45,10 +45,6 @@
<script src="unit/effects.js"></script> <script src="unit/effects.js"></script>
<script src="unit/offset.js"></script> <script src="unit/offset.js"></script>
<script src="unit/dimensions.js"></script> <script src="unit/dimensions.js"></script>
<!-- For testing http://bugs.jquery.com/ticket/7071 -->
<xml:namespace ns="urn:schemas-microsoft-com:vml" prefix="v" />
<style>v\:oval { behavior:url(#default#VML); display:inline-block; }</style>
</head> </head>
<body id="body"> <body id="body">
...@@ -151,7 +147,6 @@ ...@@ -151,7 +147,6 @@
<span id="test.foo[5]bar" class="test.foo[5]bar"></span> <span id="test.foo[5]bar" class="test.foo[5]bar"></span>
<foo_bar id="foobar">test element</foo_bar> <foo_bar id="foobar">test element</foo_bar>
<v:oval id="oval" style="width:100pt;height:75pt;" fillcolor="red"> </v:oval>
</form> </form>
<b id="floatTest">Float test.</b> <b id="floatTest">Float test.</b>
<iframe id="iframe" name="iframe"></iframe> <iframe id="iframe" name="iframe"></iframe>
......
...@@ -492,6 +492,7 @@ test("val()", function() { ...@@ -492,6 +492,7 @@ test("val()", function() {
var testVal = function(valueObj) { var testVal = function(valueObj) {
expect(8); expect(8);
QUnit.reset();
jQuery("#text1").val(valueObj( "test" )); jQuery("#text1").val(valueObj( "test" ));
equals( document.getElementById("text1").value, "test", "Check for modified (via val(String)) value of input element" ); equals( document.getElementById("text1").value, "test", "Check for modified (via val(String)) value of input element" );
...@@ -504,15 +505,16 @@ var testVal = function(valueObj) { ...@@ -504,15 +505,16 @@ var testVal = function(valueObj) {
jQuery("#text1").val(valueObj( null )); jQuery("#text1").val(valueObj( null ));
equals( document.getElementById("text1").value, "", "Check for modified (via val(null)) value of input element" ); equals( document.getElementById("text1").value, "", "Check for modified (via val(null)) value of input element" );
jQuery("#select1").val(valueObj( "3" )); var $select1 = jQuery("#select1");
equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" ); $select1.val(valueObj( "3" ));
equals( $select1.val(), "3", "Check for modified (via val(String)) value of select element" );
jQuery("#select1").val(valueObj( 2 )); $select1.val(valueObj( 2 ));
equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" ); equals( $select1.val(), "2", "Check for modified (via val(Number)) value of select element" );
jQuery("#select1").append("<option value='4'>four</option>"); $select1.append("<option value='4'>four</option>");
jQuery("#select1").val(valueObj( 4 )); $select1.val(valueObj( 4 ));
equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" ); equals( $select1.val(), "4", "Should be possible to set the val() to a newly created option" );
// using contents will get comments regular, text, and comment nodes // using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents(); var j = jQuery("#nonnodes").contents();
......
...@@ -778,6 +778,8 @@ test("trigger() shortcuts", function() { ...@@ -778,6 +778,8 @@ test("trigger() shortcuts", function() {
elem.remove(); elem.remove();
// test that special handlers do not blow up with VML elements (#7071) // test that special handlers do not blow up with VML elements (#7071)
jQuery('<xml:namespace ns="urn:schemas-microsoft-com:vml" prefix="v" />').appendTo('head');
jQuery('<v:oval id="oval" style="width:100pt;height:75pt;" fillcolor="red"> </v:oval>').appendTo('#form');
jQuery("#oval").click().keydown(); jQuery("#oval").click().keydown();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment