Merge branch 't7578' of https://github.com/jitter/jquery into jitter-t7578

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index c055fce..b0e3601 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -1,6 +1,6 @@
 (function( jQuery ) {
 
-var rclass = /[\n\t]/g,
+var rclass = /[\n\t\r]/g,
        rspaces = /\s+/,
        rreturn = /\r/g,
        rspecialurl = /^(?:href|src|style)$/,
@@ -289,7 +289,7 @@ jQuery.extend({
                name = notxml && jQuery.props[ name ] || name;
 
                // Only do all the following if this is a node (faster for style)
-               if ( elem.nodeName ) {
+               if ( elem.nodeType === 1 ) {
                        // These attributes require special treatment
                        var special = rspecialurl.test( name );
 
@@ -373,6 +373,11 @@ jQuery.extend({
                        // Non-existent attributes return null, we normalize to undefined
                        return attr === null ? undefined : attr;
                }
+               // Handle everything which isn't a DOM element node
+               if ( set ) {
+                       elem[ name ] = value;
+               }
+               return elem[ name ];
        }
 });