* fixed a regex.

 * fixed a missing `var` for `extractLink`.
 * et cetera.


git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@25647 d0d07461-0603-4401-acd4-de1884942a52

1 files changed, 17 insertions, 17 deletions

diff --git a/multi_requester.js b/multi_requester.js
index 7cbedb2..67625bd 100644
--- a/multi_requester.js
+++ b/multi_requester.js
@@ -108,7 +108,7 @@ var $U = {
     },
     A: function(hash) {
         var ret = [];
-        for (let v in hash) ret.push(hash[v]);
+        for each (let item in hash) ret.push(item);
         return ret;
     },
     bind: function(obj, func) {
@@ -126,7 +126,7 @@ var $U = {
         var sandbox;
         try {
             sandbox = new Components.utils.Sandbox(window);
-            if (Components.utils.evalInSandbox("true", sandbox) === true) {
+            if (Components.utils.evalInSandbox('true', sandbox) === true) {
                 fnc = function(text) { return Components.utils.evalInSandbox(text, sandbox); };
             }
         } catch (e) { $U.log('warning: multi_requester.js is working with unsafe sandbox.'); }
@@ -146,7 +146,7 @@ var $U = {
          return (new XPCNativeWrapper(window.content.window)).getSelection().toString();
     },
     pathToURL: function(path) {
-        if (path.match(/^http:\/\//)) return path;
+        if (/^https?:\/\//.test(path)) return path;
         var link = document.createElement('a');
         link.href= path;
         return link.href;
@@ -154,7 +154,7 @@ var $U = {
 };
 //}}}
 
-// vimperator plugin command register {{{
+// Vimperator plugin command register {{{
 var CommandRegister = {
     register: function(cmdClass, siteinfo) {
         cmdClass.siteinfo = siteinfo;
@@ -166,10 +166,10 @@ var CommandRegister = {
             {
                 completer: cmdClass.cmdCompleter || function(context, arg) {
                     context.title = ['Name', 'Descprition'];
-                    let filters = context.filter.split(',');
-                    let prefilters = filters.slice(0, filters.length - 1);
-                    let prefilter = !prefilters.length ? '' : prefilters.join(',') + ',';
-                    let subfilters = siteinfo.filter(function(s) prefilters.every(function(p) s.name != p));
+                    var filters = context.filter.split(',');
+                    var prefilters = filters.slice(0, filters.length - 1);
+                    var prefilter = !prefilters.length ? '' : prefilters.join(',') + ',';
+                    var subfilters = siteinfo.filter(function(s) prefilters.every(function(p) s.name != p));
                     var allSuggestions = subfilters.map(function(s) [prefilter + s.name, s.description]);
                     context.completions = context.filter
                         ? allSuggestions.filter(function(s) s[0].indexOf(context.filter) == 0)
@@ -190,7 +190,7 @@ var CommandRegister = {
             mappings.addUserMap(
                 [modes.NORMAL, modes.VISUAL],
                 [key],
-                "user defined mapping",
+                'user defined mapping',
                 function() {
                     if (args) {
                         liberator.execute(cmd + args);
@@ -476,16 +476,16 @@ var MultiRequester = {
         for (let i = 0, len = parsedArgs.count; i < len; i++) {
 
             let info = siteinfo[i];
-            var url = info.url;
+            let url = info.url;
             // see: http://fifnel.com/2008/11/14/1980/
-            var srcEncode = info.srcEncode || 'UTF-8';
-            var urlEncode = info.urlEncode || srcEncode;
+            let srcEncode = info.srcEncode || 'UTF-8';
+            let urlEncode = info.urlEncode || srcEncode;
 
-            var idxRepStr = url.indexOf('%s');
+            let idxRepStr = url.indexOf('%s');
             if (idxRepStr > -1 && !parsedArgs.str) continue;
 
             // via. lookupDictionary.js
-            var ttbu = Components.classes['@mozilla.org/intl/texttosuburi;1']
+            let ttbu = Components.classes['@mozilla.org/intl/texttosuburi;1']
                                  .getService(Components.interfaces.nsITextToSubURI);
             url = url.replace(/%s/g, ttbu.ConvertAndEscape(urlEncode, parsedArgs.str));
             $U.log(url + '[' + srcEncode + '][' + urlEncode + ']::' + info.xpath);
@@ -537,7 +537,7 @@ var MultiRequester = {
         ret.str = (arguments.length < 1 ? sel : arguments.join()).replace(/[\n\r]+/g, '');
 
         ret.names.split(',').forEach(function(name) {
-            let site = self.getSite(name);
+            var site = self.getSite(name);
             if (site) {
                 ret.count++;
                 ret.siteinfo.push(site);
@@ -576,14 +576,14 @@ var MultiRequester = {
             return;
         }
 
-        var url, escapedUrl, xpath, doc, html;
-
         $U.log('success!!!' + res.request.url);
         MultiRequester.requestCount--;
         if (MultiRequester.requestCount == 0) {
             MultiRequester.doProcess = false;
         }
 
+        var url, escapedUrl, xpath, doc, html, extractLink;
+
         try {
 
             if (!res.isSuccess || res.responseText == '') throw 'response is fail or null';