Changeset 7164

Timestamp:

02/26/08 17:08:50 (5 years ago)

Author:

mattn

Message:

lang/javascript/userscripts/googlereaderfullfeed.user.js:
本家0.0.7への差分をマージ。

Files:

• lang/javascript/userscripts/googlereaderfullfeed.user.js (modified) (4 diffs)

lang/javascript/userscripts/googlereaderfullfeed.user.js

@@ -8 +8 @@
 // @description loading full entry on Google Reader
 // @privilege   false
-// @version     0.0.6
+// @version     0.0.7
 // based on LDR Full Feed(http://d.hatena.ne.jp/toshi123)
 //
@@ -29 +29 @@
 'AAAAACwAAAAAEwATAAAETBDISWsNOOuNJf+aB4LiyJUZ0awNsqGB0RSYkAwhoAnKYaIEBm4EXJgC'+
 'QGFA1VBmUDwfJjjs6DQy2tJp5TBX0uf1mCO/xmYk2mxptyMAOw==';
+
+var ICON2 = 'data:image/gif;base64,'+
+'R0lGODdhEwATAPQAMUFp4YfO64fO7ofW9Yfe+LHO68XW68X3/MX3/9ne6+zn7uz/+Oz//Oz////v'+
+'8v///P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAA'+
+'EwATAAAFUCAgjmRZBmiqrqjIvqoLw/LM1unQQLyz4gECJIESHAwxgEqAUNhwAwZyBl0UnsqcNKCD'+
+'PKatbLGpBQeAQiJ3mwJydzxn0vZy0+1Y+s3EN4UAADs=';
 
 // == [Config] ======================================================
@@ -97 +103 @@
   var text = res.responseText;
 
-  if(this.info.base){
-    text = relativeToAbsolutePath(text, this.info.base);
-  } else {
-    text = relativeToAbsolutePath(text, this.itemInfo.itemURL);
-  }
   if(REMOVE_SCRIPT) text = text.replace(/<script[^>]*>[\S\s]*?<\/script[^>]*>/g, "");
   if(REMOVE_H2TAG) text = text.replace(/<h2[^>]*>[\S\s]*?<\/h2[^>]*>/g, "");
   var htmldoc = parseHTML(text);
+  if(this.info.base && !this.itemInfo.itemURL.match(this.info.base)){
+     relativeToAbsolutePath(htmldoc, this.info.base);
+  } else {
+     relativeToAbsolutePath(htmldoc, this.itemInfo.itemURL);
+  }
   for (var i = 0;i < FullFeed.documentFilters.length; i++) {
     FullFeed.documentFilters[i](htmldoc, this.itemInfo.itemURL, this.info);
@@ -435 +441 @@
 
 // == [Utility] =====================================================
-
-function relativeToAbsolutePath (text, link){
-  text = text.replace(/(<[^>]*img\s+[^>]*src\s*=\s*")([^"]+)(?="[^>]*>)/gi, function(match, l, src){
-    if (/^https?:\/\//.test(src)) {
-      return l+src;
-    } else if (src[0] == "/") {
-      var link_top = link.replace(/^(https?:\/\/[^\/]+)\/.*$/, '$1');
-      return l+link_top+src;
-    } else {
-      var link_base = link.replace(/\/[^\/]+$/, '/');
-      return l+link_base+src;
-    }
-    });
-  return text;
-}
+function relativeToAbsolutePath(htmldoc, base) {
+  var top = base.match("^https?://[^/]+")[0];
+  var current = base.replace(/\/[^/]+$/, '/');
+
+  Array.forEach(htmldoc.getElementsByTagName("a"), function (elm) {
+    if(elm.getAttribute("href")) elm.href = _rel2abs(elm.getAttribute("href"), top, current);
+  });
+  Array.forEach(htmldoc.getElementsByTagName("img"), function (elm) {
+    if(elm.getAttribute("src")) elm.src = _rel2abs(elm.getAttribute("src"), top, current);
+  });
+}
+
+function _rel2abs(url, top, current) {
+  if (url.match("^https?://")) {
+    return url;
+  } else if (url.match("^/")) {
+    return top + url;
+  } else {
+    return current + url;
+  }
+}
+
 
 function message (mes){