Changeset 25005 for lang/javascript/vimperator-plugins

Timestamp:

11/27/08 02:02:24 (6 weeks ago)

Author:

suVene

Message:

url に %s がない場合は引数なしで実行可能に

Location:

lang/javascript/vimperator-plugins

Files:

• branches/1.2/multi_requester.js (modified) (5 diffs)
• trunk/multi_requester.js (modified) (8 diffs)

lang/javascript/vimperator-plugins/branches/1.2/multi_requester.js

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.2.2
+ * @version          0.2.3
  * @minVersion       1.2
  * @maxVersion       1.2
@@ -470 +470 @@
 
         var parsedArgs = this.parseArgs(args);
-        if (!parsedArgs || !parsedArgs.siteinfo || !parsedArgs.str) { return; } // do nothing
+        if (!parsedArgs || !parsedArgs.siteinfo) { return; } // do nothing
 
         var siteinfo = parsedArgs.siteinfo;
@@ -478 +478 @@
         var urlEncode = siteinfo.urlEncode || srcEncode;
 
+        var idxRepStr = url.indexOf('%s');
+        if (idxRepStr > -1 && !parsedArgs.str) return;
+
         // via. lookupDictionary.js
         var 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 + '::' + siteinfo.xpath);
@@ -512 +517 @@
         var sel = $U.getSelectedString();
 
-        if ((sel && arguments.length < 1) || (!sel && arguments.length < 2)) return null;
+        if (arguments.length < 1) return null;
 
         var siteName = arguments.shift();
@@ -569 +574 @@
 })();
 // vim: set fdm=marker sw=4 ts=4 sts=0 et:
+

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

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.2.3
+ * @version          0.2.4
  * @minVersion       2.0pre
  * @maxVersion       2.0pre
@@ -73 +73 @@
         url:         'http://eow.alc.co.jp/%s/UTF-8/',
         xpath:       'id("resultList")'
-     },
-     {
+    },
+    {
         name:        'goo',
         description: 'goo \u8F9E\u66F8',
@@ -81 +81 @@
         srcEncode:   'EUC-JP',
         urlEncode:   'UTF-8'
-     },
-     {
-       name: 'metalarchive-band',
-       url: 'http://www.metal-archives.com/search.php?string=%s&type=band',
-       description: 'Metal Archive (band)',
-       xpath: '//table',
-     }
+    },
+    {
+        name: 'metalarchive-band',
+        url: 'http://www.metal-archives.com/search.php?string=%s&type=band',
+        description: 'Metal Archive (band)',
+        xpath: '//table',
+    }
 ];
 
@@ -476 +476 @@
         args = args.string;
         var parsedArgs = this.parseArgs(args);
-        if (!parsedArgs || !parsedArgs.siteinfo || !parsedArgs.str) { return; } // do nothing
+        if (!parsedArgs || !parsedArgs.siteinfo) { return; } // do nothing
 
         var siteinfo = parsedArgs.siteinfo;
@@ -483 +483 @@
         var srcEncode = siteinfo.srcEncode || 'UTF-8';
         var urlEncode = siteinfo.urlEncode || srcEncode;
+
+        var idxRepStr = url.indexOf('%s');
+        if (idxRepStr > -1 && !parsedArgs.str) return;
 
         // via. lookupDictionary.js
@@ -518 +521 @@
         var sel = $U.getSelectedString();
 
-        if ((sel && arguments.length < 1) || (!sel && arguments.length < 2)) return null;
+        if (arguments.length < 1) return null;
 
         var siteName = arguments.shift();
@@ -545 +548 @@
             escapedUrl = util.escapeHTML(url);
             xpath = res.request.options.siteinfo.xpath;
-            liberator.log(res.responseText)
             doc = res.getHTMLDocument(xpath);
             if (!doc) throw 'XPath result is undefined or null.: XPath -> ' + xpath;
@@ -576 +578 @@
 })();
 // vim: set fdm=marker sw=4 ts=4 sts=0 et:
+