From 90147a69fb884b472176f6d5e180ae68d5ffd525 Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 3 Jun 2012 10:40:46 +0200 Subject: [PATCH] rename Ox.highlightHTML to Ox.highlight --- source/Ox/js/HTML.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js index 5713e1ab..90072667 100644 --- a/source/Ox/js/HTML.js +++ b/source/Ox/js/HTML.js @@ -226,32 +226,32 @@ }; /*@ - Ox.highlightHTML Highlight matches in string + Ox.highlight Highlight matches in string (string, query, classname[, isHTML]) -> Output string string Input string query Case-insentitive query string, or regular expression classname Class name for matches isHTML If true, the input string is treated as HTML - > Ox.highlightHTML('', 'name', 'c') + > Ox.highlight('', 'name', 'c') '<name>' - > Ox.highlightHTML('name', 'name', 'c', true) + > Ox.highlight('name', 'name', 'c', true) 'name' - > Ox.highlightHTML('amp & amp', 'amp', 'c', true) + > Ox.highlight('amp & amp', 'amp', 'c', true) 'amp & amp' - > Ox.highlightHTML('amp & amp', 'amp & amp', 'c', true) + > Ox.highlight('amp & amp', 'amp & amp', 'c', true) 'amp & amp' - > Ox.highlightHTML('<b>', '', 'c', true) + > Ox.highlight('<b>', '', 'c', true) '<b>' - > Ox.highlightHTML('<b>', '<b>', 'c', true) + > Ox.highlight('<b>', '<b>', 'c', true) '<b>' - > Ox.highlightHTML('foobarbaz', 'foobar', 'c', true) + > Ox.highlight('foobarbaz', 'foobar', 'c', true) 'foobarbaz' - > Ox.highlightHTML('foo

bar

baz', 'foobar', 'c', true) + > Ox.highlight('foo

bar

baz', 'foobar', 'c', true) 'foo

bar

baz' - > Ox.highlightHTML('foo
bar baz', 'foo bar', 'c', true) + > Ox.highlight('foo
bar baz', 'foo bar', 'c', true) 'foo
bar
baz' @*/ - Ox.highlightHTML = function(string, query, classname, isHTML) { + Ox.highlight = function(string, query, classname, isHTML) { var cursor = 0, entities = [], matches = [], @@ -322,7 +322,6 @@ span.join(match.value) ); }); - } else { string = string.replace(re, function(value) { return span.join(value);