From ac043b1bc8096bfbb4be7995af4f5ccc5cad7c19 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Mon, 20 Aug 2012 09:33:35 -0400 Subject: [PATCH] Revert "Fix #12350. Remove BOM in jQuery.trim. Close gh-897." This reverts commit 2b5b4ebbd78ce10cbbe2a6f057feea615fc69629. String.prototype.trim doesn't trim BOM in Safari 5.0 so this won't work without additional feature detects. http://swarm.jquery.org/result/165379 --- AUTHORS.txt | 3 +-- src/core.js | 4 ++-- test/unit/core.js | 7 +------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index e5a87c7e0..01c8d76b0 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -130,5 +130,4 @@ Uri Gilad Chris Faulkner Elijah Manor Daniel Chatfield -Nikita Govorov -Wesley Walser \ No newline at end of file +Nikita Govorov \ No newline at end of file diff --git a/src/core.js b/src/core.js index 4334ae261..e7b94acda 100644 --- a/src/core.js +++ b/src/core.js @@ -37,8 +37,8 @@ var core_rnotwhite = /\S/, core_rspace = /\s+/, - // IE doesn't match many whitespace characters with \s - rtrim = core_rnotwhite.test("\xA0") ? /^[\s\xA0\uFEFF]+|[\s\xA0\uFEFF]+$/g : /^\s+|\s+$/g, + // IE doesn't match non-breaking spaces with \s + rtrim = core_rnotwhite.test("\xA0") ? (/^[\s\xA0]+|[\s\xA0]+$/g) : /^\s+|\s+$/g, // A simple way to check for HTML strings // Prioritize #id over to avoid XSS via location.hash (#9521) diff --git a/test/unit/core.js b/test/unit/core.js index 8b8b7afd8..44920edcf 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -264,7 +264,7 @@ test("noConflict", function() { }); test("trim", function() { - expect(13); + expect(9); var nbsp = String.fromCharCode(160); @@ -278,11 +278,6 @@ test("trim", function() { equal( jQuery.trim( null ), "", "Null" ); equal( jQuery.trim( 5 ), "5", "Number" ); equal( jQuery.trim( false ), "false", "Boolean" ); - - equal( jQuery.trim(" "), "", "space should be trimmed" ); - equal( jQuery.trim("ipad\xA0"), "ipad", "nbsp should be trimmed" ); - equal( jQuery.trim("\uFEFF"), "", "zwsp should be trimmed" ); - equal( jQuery.trim("\uFEFF \xA0! | \uFEFF"), "! |", "leading/trailing should be trimmed" ); }); test("type", function() { -- 2.39.5