Changeset 24375

Timestamp:

11/20/08 03:24:25 (7 weeks ago)

Author:

suVene

Message:

-s option廃止。選択テキストで実行

Files:

• lang/javascript/vimperator-plugins/branches/1.2/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.1
+ * @version          0.2.2
  * @minVersion       1.2
  * @maxVersion       1.2
@@ -11 +11 @@
  *
  * Usage:
- *   command[!] subcommand [ANY_TEXT | -s]
+ *   command[!] subcommand [ANY_TEXT]
  *
  *     !                create new tab.
  *     ANY_TEXT         your input text
- *     FLAGS:
- *       -s             use selected text
- *
- *   :mr  alc ANY_TEXT  -> request by the input text, and display to the buffer.
- *   :mr! goo -s        -> request by the selected text, and display to the new tab.
+ *
+ *   :mr  alc ANY_TEXT           -> request by the input text, and display to the buffer.
+ *   :mr! goo {window.selection} -> request by the selected text, and display to the new tab.
  *
  *
@@ -54 +52 @@
  *       [',ml', 'ex'],                  // == :mr  ex
  *       [',mg', 'goo', '!'],            // == :mr! goo
- *       [',ma', 'alc',    , 'args'],    // == :mr  alc args (however, it uses a selected_text with precedence.)
+ *       [',ma', 'alc',    , 'args'],    // == :mr  alc args
  *   ];
  *   EOM
@@ -190 +188 @@
                 "user defined mapping",
                 function() {
-                    var str = $U.getSelectedString() || args || '';
-                    if (str.length) {
-                        liberator.execute(cmd + str);
+                    if (args) {
+                        liberator.execute(cmd + args);
                     } else {
-                        liberator.commandline.open(':', cmd, liberator.modes.EX);
+                        let sel = $U.getSelectedString();
+                        if (sel.length) {
+                            liberator.execute(cmd + sel);
+                        } else {
+                            liberator.commandline.open(':', cmd, liberator.modes.EX);
+                        }
                     }
                 },
@@ -465 +467 @@
     name: DataAccess.getCommand(),
     description: 'request, and display to the buffer',
-    cmdOptions: [
-        [['-s'], liberator.OPTION_NOARG]
-    ],
     cmdAction: function(args, special, count) {
 
@@ -483 +482 @@
                              .getService(Components.interfaces.nsITextToSubURI);
         url = url.replace(/%s/g, ttbu.ConvertAndEscape(urlEncode, parsedArgs.str));
-        $U.log(url);
+        $U.log(url + '::' + siteinfo.xpath);
 
         if (special) {
@@ -510 +509 @@
         if (!args) return null;
 
-        var isOptS = args.hasOwnProperty('-s');
-        if ((isOptS && args.arguments.length < 1) || (!isOptS && args.arguments.length < 2)) return null;
-
-        var siteName = args.arguments.shift();
-        var str = (isOptS ? $U.getSelectedString() : args.arguments.join()).replace(/[\n\r]+/g, '');
+        var arguments = args.split(/ +/);
+        var sel = $U.getSelectedString();
+
+        if ((sel && arguments.length < 1) || (!sel && arguments.length < 2)) return null;
+
+        var siteName = arguments.shift();
+        var str = (arguments.length < 1 ? sel : arguments.join()).replace(/[\n\r]+/g, '');
         var siteinfo = this.getSite(siteName);
 
@@ -545 +546 @@
                    (new XMLSerializer()).serializeToString(doc).replace(/<[^>]+>/g, function(all) all.toLowerCase()) +
                    '</div>';
-            $U.echo(new XMLList(html));
+            try { $U.echo(new XMLList(html)); } catch (e) { $U.echo(html); }
 
         } catch (e) {