Changeset 25647

Timestamp:

12/01/08 23:22:22 (6 weeks ago)

Author:

drry

Message:

• fixed a regex.
  
• fixed a missing var for extractLink.
  
• et cetera.
  

Files:

• lang/javascript/vimperator-plugins/trunk/multi_requester.js (modified) (10 diffs)

lang/javascript/vimperator-plugins/trunk/multi_requester.js

@@ -109 +109 @@
     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;
     },
@@ -127 +127 @@
         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); };
             }
@@ -147 +147 @@
     },
     pathToURL: function(path) {
-        if (path.match(/^http:\/\//)) return path;
+        if (/^https?:\/\//.test(path)) return path;
         var link = document.createElement('a');
         link.href= path;
@@ -155 +155 @@
 //}}}
 
-// vimperator plugin command register {{{
+// Vimperator plugin command register {{{
 var CommandRegister = {
     register: function(cmdClass, siteinfo) {
@@ -167 +167 @@
                 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
@@ -191 +191 @@
                 [modes.NORMAL, modes.VISUAL],
                 [key],
-                "user defined mapping",
+                'user defined mapping',
                 function() {
                     if (args) {
@@ -477 +477 @@
 
             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;
-
-            var idxRepStr = url.indexOf('%s');
+            let srcEncode = info.srcEncode || 'UTF-8';
+            let urlEncode = info.urlEncode || srcEncode;
+
+            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));
@@ -538 +538 @@
 
         ret.names.split(',').forEach(function(name) {
-            let site = self.getSite(name);
+            var site = self.getSite(name);
             if (site) {
                 ret.count++;
@@ -577 +577 @@
         }
 
-        var url, escapedUrl, xpath, doc, html;
-
         $U.log('success!!!' + res.request.url);
         MultiRequester.requestCount--;
@@ -584 +582 @@
             MultiRequester.doProcess = false;
         }
+
+        var url, escapedUrl, xpath, doc, html, extractLink;
 
         try {