lang/javascript/vimperator-plugins/trunk/direct_bookmark.js:

 * added `strip_tags` to `parseHTML()`.


git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@9709 d0d07461-0603-4401-acd4-de1884942a52

1 files changed, 13 insertions, 6 deletions

diff --git a/direct_bookmark.js b/direct_bookmark.js
index 6dff12f..ed82f7b 100644
--- a/direct_bookmark.js
+++ b/direct_bookmark.js
@@ -135,14 +135,21 @@
     }

 

     // copied from Pagerization (c) id:ofk

-    function parseHTML(str, ignore_tags){

-        str = str.replace(/^[\s\S]*?<html(?:\s[^>]+?)?>|<\/html\s*>[\S\s]*$/ig, '');

+    function parseHTML(str, strip_tags, ignore_tags){

+        var exp = '^[\\s\\S]*?<html(?:\\s[^>]*)?>|</html\\s*>[\\S\\s]*$';

+        if (strip_tags) {

+            strip_tags = strip_tags instanceof Array && strip_tags.length > 1

+                        ? '(?:' + strip_tags.join('|') + ')'

+                        : String(strip_tags);

+            exp += '|<' + strip_tags + '(?:\\s[^>]*)?>|</' + strip_tags + '\\s*>';

+        }

         if (ignore_tags) {

-            ignore_tags = ignore_tags instanceof Array && ignore_tags.length > 1

-                        ? '(?:' + ignore_tags.join('|') + ')'

-                        : String(ignore_tags);

-            str = str.replace(new RegExp('<' + ignore_tags + '(?:\\s[^>]+)?>|</' + ignore_tags + '\\s*>', 'ig'), '');

+            if (!(ignore_tags instanceof Array)) ignore_tags = [ignore_tags];

+            exp += '|' + ignore_tags.map(function(tag) {

+                return '<' + tag + '(?:\\s[^>]*)?>.*?</' + tag + '\\s*>';

+            }).join('|');

         }

+        str = str.replace(new RegExp(exp, 'ig'), '');

         var res = document.implementation.createDocument(null, 'html', null);

         var range = document.createRange();

         range.setStartAfter(window.content.document.body);