From 02d56f41e0506e220f87141346b17ca5cfe77c63 Mon Sep 17 00:00:00 2001
From: drry
Date: Fri, 18 Apr 2008 11:56:46 +0000
Subject: lang/javascript/vimperator-plugins/trunk/direct_bookmark.js:  * fixed
 a bug in `parseHTML()`.

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@9717 d0d07461-0603-4401-acd4-de1884942a52
---
 direct_bookmark.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/direct_bookmark.js b/direct_bookmark.js
index eebcf5d..462a106 100644
--- a/direct_bookmark.js
+++ b/direct_bookmark.js
@@ -138,18 +138,18 @@
     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];
+            if (typeof ignore_tag != "object") ignore_tags = [ignore_tags];
             ignore_tags = ignore_tags.filter(function(tag) {
                 if (tag[tag.length - 1] != "/") return true;
                 tag = tag.replace(/\/$/, "");
-                exp += "|" + "<" + tag + "(?:\\s[^>]*)?>.*?</" + tag + "\\s*>";
+                exp += "|<" + tag + "(?:\\s[^>]*|/)?>(?:[\\s\\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*>";
+                exp += "|<" + ignore_tags + "(?:\\s[^>]*|/)?>|</" + ignore_tags + "\\s*>";
             }
         }
         str = str.replace(new RegExp(exp, "ig"), "");
-- 
cgit v1.2.3