Changeset 9842

Timestamp:

04/19/08 08:21:28 (5 years ago)

Author:

drry

Message:

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

• fixed a regexp.
  
• et cetera.
  

Files:

• lang/javascript/userscripts/autofocus.user.js (modified) (13 diffs)

lang/javascript/userscripts/autofocus.user.js

@@ -11 +11 @@
 //
 
-var CACHE_EXPIRE = 24 * 60 * 60 * 1000
-var SITEINFO_URLS = ['http://wiki.livedoor.jp/samurai20000/d/'];
-var SITEINFO = [
+const CACHE_EXPIRE = 24 * 60 * 60 * 1000;
+const SITEINFO_URLS = ['http://wiki.livedoor.jp/samurai20000/d/'];
+const SITEINFO = [
     {
-        url:   'http://reader.livedoor.com/',
+        url:   'http://reader\\.livedoor\\.com/',
         focus: '//div[@id="login"]/h3/a'
     }
-    /* templete 
+    /* templete
     {
-        url:   '',
-        focus: ''
+        url:   '',
+        focus: ''
     }
     */
@@ -30 +30 @@
     focus_element.focus();
     log('focus!');
-}
+};
 
 var launchAutoFocus = function(list) {
@@ -45 +45 @@
         }
     }
-}
+};
 
 
@@ -53 +53 @@
         if(!cacheInfo[i] || cacheInfo[i].expire < new Date()) {
             var opt = {
-                method  : 'get',
-                url     : i,
-                onload  : function(res) {getCacheCallback(res, i)},
-                onerror : function(res) {getCacheErrorCallback(i)}
+                method  : 'get',
+                url     : i,
+                onload  : function(res) {getCacheCallback(res, i)},
+                onerror : function(res) {getCacheErrorCallback(i)}
             };
             GM_xmlhttpRequest(opt);
@@ -63 +63 @@
             launchAutoFocus(cacheInfo[i].info);
         }
-    })
-}
+    });
+};
 
 // utility SITE_INFO
@@ -72 +72 @@
     var re = /^([^:]+?):(.*)$/;
     var info = {};
-    for (var i = 0; i < lines.length; i++) {
-        if (re.test(lines[i])) {
+    lines.forEach(function(line) {
+        if (re.test(line)) {
             info[RegExp.$1] = RegExp.$2.replace(/^\s+/, '');
         }
-    }
+    });
 
     var isValid = function(info) {
-        var property = ['url', 'focus'];
-        for (var i = 0; i < property.length; i++) {
-            if (!info[property[i]]) {
-                return false;
-            }
-        }
-        return true;
-    }
+        return !['url', 'focus'].some(function(property) {
+            return !info.hasOwnProperty(property);
+        });
+    };
 
     return isValid(info) ? info : null;
@@ -96 +92 @@
 
 function getCache() {
-    return eval(GM_getValue('cacheInfo')) || {};
+    return eval(GM_getValue('cacheInfo', '({})'));
 }
 
@@ -104 +100 @@
     }
 
-    var info      = [];
-    var matched   = false;
+    var info      = [];
+    var matched   = false;
     var hdoc      = createHTMLDocumentByString(res.responseText);
     var pre_areas = getElementsByXPath('//pre', hdoc) || [];
@@ -111 +107 @@
     pre_areas.forEach(function(pre_area) {
         var d = parseInfo(pre_area.innerHTML);
-        if (d) {
-            info.push(d);
-            if (!matched && location.href.match(d.url)) {
-                matched = d;
-            }
+        if (!d) return;
+        info.push(d);
+        if (!matched && location.href.match(d.url)) {
+            matched = d;
         }
     });
@@ -121 +116 @@
     if (info.length > 0) {
         cacheInfo[url] = {
-            urls        : url,
-            expire      : new Date(new Date().getTime() + CACHE_EXPIRE),
-            info        : info
+            urls   : url,
+            expire : new Date(new Date().getTime() + CACHE_EXPIRE),
+            info   : info
         }
         GM_setValue('cacheInfo', cacheInfo.toSource());
@@ -143 +138 @@
 
 function createHTMLDocumentByString(str) {
-    var html = str.replace(/<!DOCTYPE\s[^>]*?>|<html[^>]*?>|<\/html\s*>.*/g, '');
+    var html     = str.replace(/<!DOCTYPE\s[^>]*>|<html(?:\s[^>]*)?>|<\/html\s*>.*/g, '');
     var htmlDoc  = document.implementation.createDocument(null, 'html', null);
     var fragment = createDocumentFragmentByString(html);
@@ -158 +153 @@
 function getFocusElementByXpath(xpath) {
     var result = document.evaluate(xpath, document, null,
-                                   XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+                                   XPathResult.FIRST_ORDERED_NODE_TYPE, null);
     return result.singleNodeValue ? result.singleNodeValue: null;
 }
@@ -168 +163 @@
     var data = [];
     for (var i = 0; i < nodesSnapshot.snapshotLength; i++) {
-        data.push(nodesSnapshot.snapshotItem(i));
+        data.push(nodesSnapshot.snapshotItem(i));
     }
     return (data.length >= 1) ? data : null;