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

This commit is contained in:
jeresig 2009-11-30 13:42:26 -05:00
commit df6e02a4a7
2 changed files with 12 additions and 1 deletions

View file

@ -29,7 +29,7 @@ var jQuery = function( selector, context ) {
rnotwhite = /\S/, rnotwhite = /\S/,
// Used for trimming whitespace // Used for trimming whitespace
rtrim = /^\s+|\s+$/g, rtrim = /(\s|\u00A0)+|(\s|\u00A0)+$/g,
// Match a standalone tag // Match a standalone tag
rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,

View file

@ -189,6 +189,17 @@ test("noConflict", function() {
jQuery = $$; jQuery = $$;
}); });
test("trim", function() {
expect(4);
var nbsp = String.fromCharCode(160);
equals( jQuery.trim("hello "), "hello", "trailing space" );
equals( jQuery.trim(" hello"), "hello", "leading space" );
equals( jQuery.trim(" hello "), "hello", "space on both sides" );
equals( jQuery.trim(" " + nbsp + "hello " + nbsp + " "), "hello", "&nbsp;" );
});
test("isFunction", function() { test("isFunction", function() {
expect(19); expect(19);