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

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

1 files changed, 16 insertions, 13 deletions

diff --git a/multi_requester.js b/multi_requester.js
index 5eb0bd5..fdd6994 100644
--- a/multi_requester.js
+++ b/multi_requester.js
@@ -4,7 +4,7 @@
  * @description      request, and the result is displayed to the buffer.
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.2.3
+ * @version          0.2.4
  * @minVersion       2.0pre
  * @maxVersion       2.0pre
  * ==/VimperatorPlugin==
@@ -72,21 +72,21 @@ var SITEINFO = [
         description: 'SPACE ALC (\u82F1\u8F9E\u6717 on the Web)',
         url:         'http://eow.alc.co.jp/%s/UTF-8/',
         xpath:       'id("resultList")'
-     },
-     {
+    },
+    {
         name:        'goo',
         description: 'goo \u8F9E\u66F8',
         url:         'http://dictionary.goo.ne.jp/search.php?MT=%s&kind=all&mode=0&IE=UTF-8',
         xpath:       'id("incontents")/*[@class="ch04" or @class="fs14" or contains(@class, "diclst")]',
         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',
+    }
 ];
 
 var mergedSiteinfo = {};
@@ -475,7 +475,7 @@ var MultiRequester = {
 
         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;
         var url = siteinfo.url;
@@ -483,6 +483,9 @@ var MultiRequester = {
         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
         var ttbu = Components.classes['@mozilla.org/intl/texttosuburi;1']
                              .getService(Components.interfaces.nsITextToSubURI);
@@ -517,7 +520,7 @@ var MultiRequester = {
         var arguments = args.split(/ +/);
         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();
         var str = (arguments.length < 1 ? sel : arguments.join()).replace(/[\n\r]+/g, '');
@@ -544,7 +547,6 @@ var MultiRequester = {
             url = res.request.url;
             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;
 
@@ -575,3 +577,4 @@ return MultiRequester;
 
 })();
 // vim: set fdm=marker sw=4 ts=4 sts=0 et:
+