Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/jquery/jquery

  • Loading branch information...
petersendidit committed Oct 8, 2010
2 parents 60744e8 + a2aefbf commit 3bd737e81a7f5806f73c078aa8e3bebc2fb9c6d0
Showing with 11 additions and 8 deletions.
  1. +1 −1 src/css.js
  2. +1 −1 src/data.js
  3. +3 −3 test/unit/ajax.js
  4. +6 −3 test/unit/css.js
@@ -204,7 +204,7 @@ if ( !jQuery.support.opacity ) {

style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
opacity;
style.filter + ' ' + opacity;
}
};
}
@@ -121,7 +121,7 @@ jQuery.extend({
// A method for determining if a DOM node can handle the data expando
acceptData: function( elem ) {
if ( elem.nodeName ) {
match = jQuery.noData[ elem.nodeName.toLowerCase() ];
var match = jQuery.noData[ elem.nodeName.toLowerCase() ];

if ( match ) {
return !(match === true || elem.getAttribute("classid") !== match);
@@ -362,11 +362,11 @@ test("serialize()", function() {
);

equals( jQuery('#form').serialize(),
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2",
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3",
'Check form serialization as query string');

equals( jQuery('#form :input').serialize(),
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2",
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3",
'Check input serialization as query string');

equals( jQuery('#testForm').serialize(),
@@ -378,7 +378,7 @@ test("serialize()", function() {
'Check input serialization as query string');

equals( jQuery('#form, #testForm').serialize(),
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
'Multiple form serialization as query string');

/* Temporarily disabled. Opera 10 has problems with form serialization.
@@ -114,11 +114,14 @@ if(jQuery.browser.msie) {

var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
jQuery('#foo').css("filter", filterVal);
equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
jQuery('#foo').css("opacity", 1)
equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't clobber other filters" );
equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" )
jQuery('#foo').css("opacity", 1);
equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" );
equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" );
jQuery('#foo').css("filter", filterVal3).css("opacity", 1);
ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
});
}

0 comments on commit 3bd737e

Please sign in to comment.
You can’t perform that action at this time.