From df0a3fb8531a452a7b3c6eb7cd7eb7cd59b32d88 Mon Sep 17 00:00:00 2001
From: Anton M <obhvsbypqghgc@gmail.com>
Date: Wed, 1 Dec 2010 21:31:22 +0100
Subject: [PATCH] Handle carriage return characters in className property.
 Fixes #7673.

---
 src/attributes.js       |    2 +-
 test/unit/attributes.js |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/attributes.js b/src/attributes.js
index 4824c29..4d54fd4 100644
--- 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)$/,
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 2d0a0d6..eb05e48 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -719,7 +719,7 @@ test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
 });
 
 test("addClass, removeClass, hasClass", function() {
-	expect(14);
+	expect(17);
  
 	var jq = jQuery("<p>Hi</p>"), x = jq[0];
  
@@ -739,12 +739,14 @@ test("addClass, removeClass, hasClass", function() {
 	ok( jq.hasClass("hi"), "Check has1" );
 	ok( jq.hasClass("bar"), "Check has2" );
  
-	var jq = jQuery("<p class='class1\nclass2\tcla.ss3\n'></p>");
-	ok( jq.hasClass("class1"), "Check hasClass with carriage return" );
-	ok( jq.is(".class1"), "Check is with carriage return" );
+	var jq = jQuery("<p class='class1\nclass2\tcla.ss3\n\rclass4'></p>");
+	ok( jq.hasClass("class1"), "Check hasClass with line feed" );
+	ok( jq.is(".class1"), "Check is with line feed" );
 	ok( jq.hasClass("class2"), "Check hasClass with tab" );
 	ok( jq.is(".class2"), "Check is with tab" );
 	ok( jq.hasClass("cla.ss3"), "Check hasClass with dot" );
+	ok( jq.hasClass("class4"), "Check hasClass with carriage return" );
+	ok( jq.is(".class4"), "Check is with carriage return" );
  
 	jq.removeClass("class2");
 	ok( jq.hasClass("class2")==false, "Check the class has been properly removed" );
@@ -752,4 +754,6 @@ test("addClass, removeClass, hasClass", function() {
 	ok( jq.hasClass("cla.ss3"), "Check the dotted class has not been removed" );
 	jq.removeClass("cla.ss3");
 	ok( jq.hasClass("cla.ss3")==false, "Check the dotted class has been removed" );
+	jq.removeClass("class4");
+	ok( jq.hasClass("class4")==false, "Check the class has been properly removed" );
 });
-- 
1.7.10.4