Changeset 7404

Timestamp:

03/03/08 18:58:05 (5 years ago)

Author:

drry

Message:

lang/javascript/userscripts/googlereaderfullfeed.user.js:

• fixed a message problem on Fx 3.
  
• cleaned up.
  

Files:

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

lang/javascript/userscripts/googlereaderfullfeed.user.js

@@ -12 +12 @@
 // author: mattn <mattn.jp@gmail.com>
 
-var w = unsafeWindow || this;
-w.onload = function() {
-  googleReaderFullFeed();
-};
-
-function googleReaderFullFeed() {
-
+(function(w) {
 // == [CSS] =========================================================
 const CSS = <><![CDATA[
@@ -121 +115 @@
     relativeToAbsolutePath(htmldoc, this.itemInfo.itemURL);
   }
-  for (var i = 0, l = FullFeed.documentFilters.length; i < l; ) {
-    FullFeed.documentFilters[i++](htmldoc, this.itemInfo.itemURL, this.info);
-  }
+  for (var i = 0, l = FullFeed.documentFilters.length; i < l;
+    FullFeed.documentFilters[i++](htmldoc, this.itemInfo.itemURL, this.info));
   try {
     var entry = getElementsByXPath(this.info.xpath, htmldoc);
-  }
-  catch (e) {
+  } catch (e) {
     message(e);
     return;
@@ -135 +127 @@
     this.removeEntry();
     entry = this.addEntry(entry);
-    for (var i = 0, l = FullFeed.filters.length; i < l; ) {
-      FullFeed.filters[i++](entry);
-    }
+    for (var i = 0, l = FullFeed.filters.length; i < l;
+      FullFeed.filters[i++](entry));
     this.requestEnd();
   } else {
@@ -186 +177 @@
   };
   var info = {};
-  for(var i = lines.length; i > 0; ) {
+  for (var i = lines.length; i > 0; ) {
     if (reg.test(lines[--i])) {
       info[RegExp.$1] = trimspace(RegExp.$2);
@@ -198 +189 @@
       }
     }
-    try{
+    try {
       new RegExp(info.url);
     } catch (e) {
@@ -251 +242 @@
 
 
-FullFeed.getCache = function() {
-  return eval(GM_getValue('cache')) || {};
+FullFeed.getCache = function(key, oDefault) {
+  return eval(GM_getValue(key || 'cache', oDefault || "({})"));
 };
 
@@ -258 +249 @@
   if (!WIDGET) return;
   var exps = [];
-  for (var i = 0, l = SITE_INFO.length; i < l; ) {
-    exps.push(SITE_INFO[i++].url);
-  }
+  for (var i = 0, l = SITE_INFO.length; i < l; exps.push(SITE_INFO[i++].url));
   for (var url in cacheInfo) {
     var site = cacheInfo[url];
-    for (var i = 0, l = site.info.length; i < l; ) {
-      exps.push(site.info[i++].url);
-    }
+    for (var i = 0, l = site.info.length; i < l; exps.push(site.info[i++].url));
   }
   pattern = exps.join('|');
@@ -415 +402 @@
 
   if (!c.find) {
-    for (var i = 0, l = SITEINFO_IMPORT_URLS.length; i < l && !c.find; ) {
-      launchFullFeed(cacheInfo[SITEINFO_IMPORT_URLS[i++]].info, c);
-    }
+    for (var i = 0, l = SITEINFO_IMPORT_URLS.length; i < l && !c.find;
+      launchFullFeed(cacheInfo[SITEINFO_IMPORT_URLS[i++]].info, c));
   }
 
@@ -457 +443 @@
 function removeXSSRisks(htmldoc) {
   var attr = "allowScriptAccess";
+
   Array.forEach(htmldoc.getElementsByTagName("embed"), function(embed) {
     embed.hasAttribute(attr) && embed.setAttribute(attr, "never");
@@ -469 +456 @@
   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("a"), function(a) {
+    if (a.getAttribute("href"))
+      a.href = _rel2abs(a.getAttribute("href"), top, current);
   });
-  Array.forEach(htmldoc.getElementsByTagName("img"), function(elm) {
-    if(elm.getAttribute("src")) elm.src = _rel2abs(elm.getAttribute("src"), top, current);
+  Array.forEach(htmldoc.getElementsByTagName("img"), function(img) {
+    if (img.getAttribute("src"))
+      img.src = _rel2abs(img.getAttribute("src"), top, current);
   });
 }
@@ -513 +502 @@
   flash.id = 'FLASH_MESSAGE';
   hide(flash);
-  document.body.appendChild(flash);
+  document.documentElement.appendChild(flash);
   var canceler;
   this.showFlashMessageWindow = function(string, duration) {
@@ -567 +556 @@
   //w.message(""); w.message(mes);
   //console.log(mes);
+  FlashMessage.showFlashMessageWindow("");
   FlashMessage.showFlashMessageWindow(mes, 1000);
 }
@@ -573 +563 @@
 function getElementsByXPath(xpath, node) {
   var node = node || document;
-  var doc = node.ownerDocument ? node.ownerDocument : node;
-  var nodesSnapshot = doc.evaluate(xpath, node, null,
-    XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+  var nodesSnapshot = (node.ownerDocument || node).
+    evaluate(xpath, node, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
   var data = []
-  for (var i = 0, l = nodesSnapshot.snapshotLength; i < l; ) {
-    data.push(nodesSnapshot.snapshotItem(i++));
-  }
+  for (var i = 0, l = nodesSnapshot.snapshotLength; i < l;
+    data.push(nodesSnapshot.snapshotItem(i++)));
   return data.length > 0 ? data : null;
 }
@@ -585 +573 @@
 function getFirstElementByXPath(xpath, node) {
   var node = node || document;
-  var doc = node.ownerDocument ? node.ownerDocument : node;
-  var result = doc.evaluate(xpath, node, null,
-    XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+  var result = (node.ownerDocument || node).
+    evaluate(xpath, node, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
   return result.singleNodeValue ? result.singleNodeValue : null;
 }
@@ -618 +605 @@
 }
 
-}
+})(unsafeWindow || this);