Follow CVS Head.

etc



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

14 files changed, 78 insertions, 81 deletions

diff --git a/every.js b/every.js
index 05c5762..ef077a7 100644
--- a/every.js
+++ b/every.js
@@ -82,21 +82,21 @@
   liberator.modules.commands.addUserCommand(
     ['every', 'ev'],
     'every',
-    function (arg, bang, count) {
-      if (bang) {
-        kill(arg.arguments[0]);
+    function (args) {
+      if (args.bang) {
+        kill(args[0]);
       } else {
-        run(arg.string, msec(count));
+        run(args.string, msec(args.count));
       }
     },
     {
       count: true,
       bang: true,
       argCount: '+',
-      completer: function (context, arg, bang) {
-        if (bang) {
+      completer: function (context, args) {
+        if (args.bang) {
           context.title = ['PID', 'every process'];
-          context.items = [['*', 'kill em all']].concat(every.ps.map(function (p, i) ([i.toString(), p.command])));
+          context.completions = [['*', 'kill em all']].concat(every.ps.map(function (p, i) ([i.toString(), p.command])));
         } else {
           liberator.modules.completion.ex(context);
         }
diff --git a/feedSomeKeys.js b/feedSomeKeys.js
index 34b35b7..41afdbb 100644
--- a/feedSomeKeys.js
+++ b/feedSomeKeys.js
@@ -303,17 +303,17 @@ function feedKeyIntoContent(keys, useVkey){
 // Command
 // --------------------------
 commands.addUserCommand(['feedmap','fmap'],'Feed Map a key sequence',
-    function(args, bang){
-        var arg = args.string == undefined ? args: args.string;
+    function(args){
+        var arg = args.string;
         if(!arg){
             liberator.echo(feedMaps.map(function(map) map.description.replace(/</g,'&lt;').replace(/>/g,'&gt;')),true);
             return;
         }
         var [ ,lhs,rhs] = arg.match(/(\S+)(?:\s+(.+))?/);
         if (!rhs){
-            replaceUserMap(lhs,lhs,bang);
+            replaceUserMap(lhs,lhs,args.bang);
         } else {
-            replaceUserMap(lhs,rhs,bang);
+            replaceUserMap(lhs,rhs,args.bang);
         }
     },{
         bang: true
@@ -327,10 +327,10 @@ var converter = {
     reset: destroy
 };
 commands.addUserCommand(['feedmaps','fmaps'], '',
-  function(args, bang){
+  function(args){
     var feedkey = args["-depth"];
     var vkey = '-vkey' in args;
-    var keys = args.arguments;
+    var keys = args;
     if ('-' in args) keys.push('-');
 
     if (feedkey) keys = keys.map( function(i) [i, (feedkey+"")+i] );
diff --git a/feedSomeKeys_2.js b/feedSomeKeys_2.js
index 508f6b4..927c0e6 100644
--- a/feedSomeKeys_2.js
+++ b/feedSomeKeys_2.js
@@ -311,7 +311,7 @@ commands.addUserCommand(['feedmap','fmap'],'Feed Map a key sequence',
         if (args.bang) destroy();
         var depth = args["-depth"] ? args["-depth"] : "";
         var useVkey = "-vkey" in args;
-        
+
         args.forEach(function(keypair){
             var [lhs, rhs] = keypair.split(",");
             if (!rhs) rhs = lhs;
diff --git a/gmperator.js b/gmperator.js
index da295da..0d804c6 100644
--- a/gmperator.js
+++ b/gmperator.js
@@ -210,11 +210,11 @@ liberator.plugins.gmperator = (function(){ //{{{
 // User Command
 // ---------------------------
 commands.addUserCommand(['gmli[st]','lsgm'], 'list Greasemonkey scripts', //{{{
-    function(arg,special){
+    function(arg){
         var str = '';
         var scripts = GM_getConfig().scripts;
         var reg;
-        if (special || arg == 'full'){
+        if (arg.bang || arg == 'full'){
             reg = new RegExp('.*');
         } else if( arg ){
             reg = new RegExp(arg,'i');
@@ -268,7 +268,7 @@ commands.addUserCommand(['gmli[st]','lsgm'], 'list Greasemonkey scripts', //{{{
     }
 ); //}}}
 commands.addUserCommand(['gmlo[ad]'], 'load Greasemonkey scripts', //{{{
-    function(arg, special){
+    function(arg){
         if (!arg) {
             echoerr('Usage: :gmlo[ad][!] {name|filename}');
             return;
@@ -284,7 +284,7 @@ commands.addUserCommand(['gmlo[ad]'], 'load Greasemonkey scripts', //{{{
         if (!script) {
             echoerr('no such a user script');
             return;
-        } else if (liberator.plugins.gmperator.currentContainer.hasScript(script._filename) && !special){
+        } else if (liberator.plugins.gmperator.currentContainer.hasScript(script._filename) && !arg.bang){
             echoerr(script._filename + ' is already loaded!');
             return;
         } else {
@@ -311,16 +311,15 @@ commands.addUserCommand(['gmlo[ad]'], 'load Greasemonkey scripts', //{{{
     }
 ); //}}}
 commands.addUserCommand(['gmset'], 'change settings for Greasemonkey scripts', //{{{
-    function(args, special){
+    function(args){
         var options = [ [['-name','-n'],    commands.OPTION_STRING],
                         [['-include','-i'], commands.OPTION_LIST],
                         [['-exclude','-e'], commands.OPTION_LIST] ];
-        var res = commands.parseArgs(args, options);
-        if (res.arguments.length == 0) {
-            if (special) GM_setEnabled(!GM_getEnabled()); // toggle enable/disable Greasemonkey
+        if (args.length == 0) {
+            if (args.bang) GM_setEnabled(!GM_getEnabled()); // toggle enable/disable Greasemonkey
             return;
         }
-        var filename = res.arguments[0];
+        var filename = args[0];
         var config = GM_getConfig();
         var script;
         for (var i=0; i<config.scripts.length; i++){
@@ -330,12 +329,12 @@ commands.addUserCommand(['gmset'], 'change settings for Greasemonkey scripts', /
             }
         }
         if (!script) return;
-        if (special){ // toggle enable/disable the script if {filename} is exist
+        if (args.bang){ // toggle enable/disable the script if {filename} is exist
             script.enabled = !script.enabled;
         }
-        if (res['-name']) script.name = res['-name'];
-        if (res['-include']) script.include = res['-include'];
-        if (res['-exclude']) script.exclude = res['-exclude'];
+        if (args['-name']) script.name = args['-name'];
+        if (args['-include']) script.include = args['-include'];
+        if (args['-exclude']) script.exclude = args['-exclude'];
         config._save();
     },{
         completer: function(filter)
diff --git a/incuri.js b/incuri.js
index 7b9679d..623be6f 100644
--- a/incuri.js
+++ b/incuri.js
@@ -33,7 +33,7 @@
         return str;
     }
     function makeinc(f, p)
-        function(arg) {
+        function(args) {
             var l = window.content.location;
             var part = l[p];
             if(p == "port" && part == "") {
@@ -42,7 +42,7 @@
                 })[l.protocol] || part;
             }
             if(numreg.test(part)) {
-                arg = arg.arguments[0];
+                arg = args[0];
                 let num = RegExp.$2;
                 let quantity = !arg || isNaN(arg) ? 1 : parseInt(arg);
                 let nextnum = numstr(f(parseInt(num, 10), quantity), num.length);
diff --git a/lo.js b/lo.js
index 224b8d7..d91d742 100644
--- a/lo.js
+++ b/lo.js
@@ -79,15 +79,15 @@
     commands.addUserCommand(
       ['fo[pen]', 'filteropen'],
       'Filtered open',
-      function (opts, bang) {
-        let where = charToWhere(opts['-where'], bang ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB);
-        let [i, links] = [1, filteredLinks(opts.arguments.join(''))];
+      function (args, bang) {
+        let where = charToWhere(args['-where'], bang ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB);
+        let [i, links] = [1, filteredLinks(args.join(''))];
         if (!links.length)
           return;
         liberator.open(links[0].href, where);
         if (links.length <= 1)
           return;
-        let interval = (opts['-interval'] || liberator.globalVariables.fopen_default_interval || 1) * 1000;
+        let interval = (args['-interval'] || liberator.globalVariables.fopen_default_interval || 1) * 1000;
         foihandle = setInterval(function () {
           try {
             liberator.open(links[i].href, where);
@@ -131,9 +131,9 @@
     commands.addUserCommand(
       ['lo[pen]', 'linkopen'],
       'Filtered open',
-      function (arg, bang) {
-        let where = charToWhere(arg['-where'], bang ? liberator.NEW_TAB : liberator.CURRENT_TAB);
-        let numUrl = arg.arguments[0];
+      function (args, bang) {
+        let where = charToWhere(args['-where'], bang ? liberator.NEW_TAB : liberator.CURRENT_TAB);
+        let numUrl = args[0];
         let m = numUrl.match(/^(\d+),(.+)$/);
         if (m) {
           let link = lolinks[parseInt(m[1], 10)];
diff --git a/migemized_find.js b/migemized_find.js
index d658753..3398f12 100644
--- a/migemized_find.js
+++ b/migemized_find.js
@@ -404,12 +404,12 @@
   commands.addUserCommand(
     ['ml', 'migelight'],
     'Migelight matched words',
-    function (opts, bang) {
-      if (bang) {
-        let colors = opts.arguments.join(' ') + ' ' + (opts['-color'] || '');
+    function (args) {
+      if (args.bang) {
+        let colors = args.join(' ') + ' ' + (args['-color'] || '');
         liberator.execute('removemigelight ' + colors);
       } else {
-        let r = MF.highlightAll(opts.arguments.join(' '), opts['-color']);
+        let r = MF.highlightAll(args.join(' '), args['-color']);
         liberator.echo(r ? r.length + ' words migelighted.'
                : 'word not found.');
       }
@@ -442,8 +442,8 @@
   commands.addUserCommand(
     ['mf[ind]'],
     'Migemized find',
-    function (opts) {
-      if (!MF.findSubmit(opts.arguments.join(' '), opts['-backward'], opts['-color']))
+    function (args) {
+      if (!MF.findSubmit(args.join(' '), args['-backward'], args['-color']))
         liberator.echoerr('not found: ' + MF.currentSearchText);
     },
     {
diff --git a/nnp_cooperation.js b/nnp_cooperation.js
index 4b46e13..dad1ab7 100644
--- a/nnp_cooperation.js
+++ b/nnp_cooperation.js
@@ -145,8 +145,8 @@ const itemHTML = [
 // scrape from div element that inserted by NicoNicoPlaylist

 liberator.modules.commands.addUserCommand(['nnpgetlist'], 'get NicoNicoPlaylist',

     function (args) {

-        var arg = (args.arguments.length > 1)

-            ? args.arguments[0].toString()

+        var arg = (args.length > 1)

+            ? args[0].toString()

             : args.string;

 

         // check existence of NicoNicoPlaylist

diff --git a/proxy.js b/proxy.js
index 2a0ff9a..ecb2f24 100644
--- a/proxy.js
+++ b/proxy.js
@@ -91,7 +91,7 @@
     commands.addUserCommand(["proxy"], 'Proxy settings', function (args) {
         const prefs = Components.classes["@mozilla.org/preferences-service;1"]
                       .getService(Components.interfaces.nsIPrefService);
-        var name = (args.arguments.length > 1) ? args.arguments[0].toString() : args.string;
+        var name = (args.length > 1) ? args[0].toString() : args.string;
 
         if (!name) {
             liberator.echo("Usage: proxy {setting name}");
diff --git a/refcontrol.js b/refcontrol.js
index d0f84fc..68ba6f3 100644
--- a/refcontrol.js
+++ b/refcontrol.js
@@ -125,17 +125,16 @@ var manager = new RefControl();
 
 // add user command
 commands.addUserCommand(['addref'], 'add referrer control setting', function(args) {
-  var domain = args.arguments[0];
-  var perf = args.arguments[1] || '';
+  var domain = args[0];
+  var perf = args[1] || '';
   if (!domain || /[:\/]/.test(domain)) {
     liberator.echo(dump(sites)+'usage: addref [domain] [@NORMAL or @FORGE or empty]');
     return;
   }
   sites[domain] = perf;
   }, {
-    completer: function(context, arg, special) {
+    completer: function(context, args, special) {
       //var last = context.contextList.slice(-1)[0];
-      var args = arg.arguments;
       var list;
       var pos = 0;
       if (args.length == 2) {
diff --git a/stella.js b/stella.js
index 2b4edc6..902e316 100644
--- a/stella.js
+++ b/stella.js
@@ -630,9 +630,9 @@
                 if (p.has(func, 'rwt'))
                   p.toggle(func);
                 else if (p.has(func, 'rw'))
-                  p[func] = arg.arguments[0];
+                  p[func] = arg[0];
                 else if (p.has(func, 'x'))
-                  p[func].apply(p, arg.arguments);
+                  p[func].apply(p, arg);
                 stella.update();
               },
           {argCount: '*', bang: !!funcB},
diff --git a/stylechanger.js b/stylechanger.js
index 565adbf..f76fef7 100644
--- a/stylechanger.js
+++ b/stylechanger.js
@@ -194,15 +194,15 @@ liberator.plugins.styleSheetsManger = (function(){
 	var CSSData = {};
 	commands.addUserCommand(['hi[ghlight]'], 'temporary style changer',
 		function(args){
-			if (args.arguments.length == 0){
+			if (args.length == 0){
 				var str = ['show highlight list'];
 				for (let name in CSSData){
 					str.push('<span class="hl-Title">' + name + '</span>');
 					str.push(CSSData[name]);
 				}
 				echo(str.join('\n'), true);
-			} else if (args.arguments.length == 1){
-				var arg = args.arguments[0];
+			} else if (args.length == 1){
+				var arg = args[0];
 				if (arg == 'clear'){
 					for (let name in CSSData){
 						manager.unload(getURIFromCSS(CSSData[name]));
@@ -211,10 +211,10 @@ liberator.plugins.styleSheetsManger = (function(){
 				} else if (arg in CSSData){
 					echo('<span class="hl-Title">' + rel.args[0] + '</span>\n' + CSSData[rel.args[0]], true);
 				}
-			} else if (args.arguments.length > 1){
-				var groupName = args.arguments.shift();
+			} else if (args.length > 1){
+				var groupName = args.shift();
 				if (groupName == 'clear'){
-					args.arguments.forEach(function(name){
+					args.forEach(function(name){
 						if (name in CSSData){
 							manager.unload(getURIFromCSS(CSSData[name]));
 							delete CSSData[name];
@@ -222,31 +222,30 @@ liberator.plugins.styleSheetsManger = (function(){
 					});
 				} else {
 					if (groupName in CSSData) manager.unload(getURIFromCSS(CSSData[groupName]));
-					CSSData[groupName] = args.arguments.join(' ');
+					CSSData[groupName] = args.join(' ');
 					manager.load(getURIFromCSS(CSSData[groupName]));
 				}
 			}
 		}, {
-			completer: function(aFilter){
-				var rel = commands.parseArgs(aFilter, null, '*');
+			completer: function(context, args){
 				var list1 = [['clear', 'clear all or specified group']];
 				var list2 = [];
-				if (!rel){
+				if (!args){
 					for (let name in CSSData){
 						list2.push([name, CSSData[name]]);
 					}
 					return [0, list1.concat(list2)];
 				}
-				if (rel.arguments.length == 2 && rel.arguments[0] == 'clear'){
+				if (args.length == 2 && args[0] == 'clear'){
 					for (let name in CSSData){
-						if (name.indexOf(rel.arguments[1]) == 0) list2.push([name, CSSData[name]]);
+						if (name.indexOf(args[1]) == 0) list2.push([name, CSSData[name]]);
 					}
 					return [6, list2];
-				} else if (rel.args.length == 1){
+				} else if (args.args.length == 1){
 					for (let name in CSSData){
-						if (name.indexOf(rel.arguments[0]) == 0) list2.push([name, CSSData[name]]);
+						if (name.indexOf(args[0]) == 0) list2.push([name, CSSData[name]]);
 					}
-					if ('clear'.indexOf(rel.arguments[0]) == 0)
+					if ('clear'.indexOf(args[0]) == 0)
 						return [0, list1.concat(list2)];
 					else
 						return [0, list2];
diff --git a/xpcom_inspector.js b/xpcom_inspector.js
index 9d4e792..ebffef6 100644
--- a/xpcom_inspector.js
+++ b/xpcom_inspector.js
@@ -105,12 +105,11 @@ for (let c in Cc){
 // Commands
 // ----------------------------------------------
 commands.addUserCommand(['lscc'], 'List XPCOM class',
-	function(arg){
-		if (!arg){
+	function(args){
+		if (!args.length){
 			liberator.echoerr('No arguments');
 			return;
 		}
-		var args = args.arguments ? args.arguments: commands.parseArgs(arg).arguments;
 		if (args.length == 1){
 			liberator.echo(liberator.XPCOM.listClass(args[0], null, true), true);
 		} else if (args[1] in Ci){
@@ -120,9 +119,8 @@ commands.addUserCommand(['lscc'], 'List XPCOM class',
 			liberator.echo(liberator.XPCOM.listClass(args[0], args[1], true), true);
 		}
 	}, {
-		completer: function(filter){
-			if (!filter) return [];
-			var args = filter.arguments? filter.filter: commands.parseArgs(filter).arguments;
+		completer: function(context, args){
+			if (!args.length) return;
 			var list = [];
 			var position = 0;
 			var reg;
@@ -138,7 +136,9 @@ commands.addUserCommand(['lscc'], 'List XPCOM class',
 				}
 				position = args[0].length + 1;
 			}
-			return [position, list];
+			context.title = ['Name', 'Number'];
+			context.advance(position);
+			context.completions = list;
 		}
 	}
 );
diff --git a/youtubeamp.js b/youtubeamp.js
index 5f3f6de..21bd18f 100644
--- a/youtubeamp.js
+++ b/youtubeamp.js
@@ -290,12 +290,12 @@ liberator.modules.commands.addUserCommand(
 liberator.modules.commands.addUserCommand(
     ['ytseek'],
     'controll seek bar',
-    function(args, special) {
+    function(args) {
         try {
-            let arg = (args.arguments.length > 1)
-                ? args.arguments[0].toString()
+            let arg = (args.length > 1)
+                ? args[0].toString()
                 : args.string;
-            special ? controller.seekBy(arg) : controller.seekTo(arg);
+            args.bang ? controller.seekBy(arg) : controller.seekTo(arg);
         }
         catch(e) { liberator.echoerr(e); }
     },
@@ -307,12 +307,12 @@ liberator.modules.commands.addUserCommand(
 liberator.modules.commands.addUserCommand(
     ['ytvolume'],
     'controll volume',
-    function(args, special) {
+    function(args) {
         try {
-            let arg = (args.arguments.length > 1)
-                ? args.arguments[0].toString()
+            let arg = (args.length > 1)
+                ? args[0].toString()
                 : args.string;
-            special ? controller.volumeBy(arg) : controller.volumeTo(arg);
+            args.bang ? controller.volumeBy(arg) : controller.volumeTo(arg);
         }
         catch(e) { liberator.echoerr(e); }
     },