Changeset 9713

Timestamp:

04/18/08 20:10:46 (5 years ago)

Author:

drry

Message:

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

• parseHTML()
  
  • removed a strip_tags. now you can add a tailing slash suffix instead.
    

Files:

• lang/javascript/vimperator-plugins/trunk/direct_bookmark.js (modified) (3 diffs)

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

@@ -136 +136 @@
 
     // copied from Pagerization (c) id:ofk
-    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*>';
-        }
+    function parseHTML(str, ignore_tags){
+        var exp = "^[\\s\\S]*?<html(?:\\s[^>]*)?>|</html\\s*>[\\S\\s]*$";
         if (ignore_tags) {
             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);
+            ignore_tags = ignore_tags.filter(function(tag) {
+                if (tag[tag.length - 1] != "/") return true;
+                tag = tag.replace(/\/$/, "");
+                exp += "|" + "<" + tag + "(?:\\s[^>]*)?>.*?</" + tag + "\\s*>";
+                return false;
+            });
+            if (ignore_tags.length > 0) {
+                ignore_tags = ignore_tags.length > 1
+                            ? "(?:" + ignore_tags.join("|") + ")"
+                            : String(ignore_tags);
+                exp += "|<" + ignore_tags + "(?:\\s[^>]*)?>|</" + ignore_tags + "\\s*>";
+            }
+        }
+        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);
@@ -267 +270 @@
                 xhr.send(null);
 
-                var mypage_html = parseHTML(xhr.responseText, ['img', 'script']);
+                var mypage_html = parseHTML(xhr.responseText, ['img', 'script/']);
                 var tags = getElementsByXPath("//ul[@id=\"taglist\"]/li/a",mypage_html);
 
@@ -342 +345 @@
                 xhr.send(null);
 
-                var mypage_html = parseHTML(xhr.responseText, ['img', 'script']);
+                var mypage_html = parseHTML(xhr.responseText, ['img', 'script/']);
                 var tags = getElementsByXPath("id(\"tag_list\")/span",mypage_html);