Changeset 25172 for lang/javascript/vimperator-plugins

Timestamp:

11/28/08 06:12:05 (6 weeks ago)

Author:

anekos

Message:

Follow CVS Head.
etc

Location:

lang/javascript/vimperator-plugins/trunk

Files:

• every.js (modified) (2 diffs)
• feedSomeKeys.js (modified) (3 diffs)
• feedSomeKeys_2.js (modified) (1 diff)
• gmperator.js (modified) (5 diffs)
• incuri.js (modified) (2 diffs)
• lo.js (modified) (3 diffs)
• migemized_find.js (modified) (2 diffs)
• nnp_cooperation.js (modified) (1 diff)
• proxy.js (modified) (1 diff)
• refcontrol.js (modified) (2 diffs)
• stella.js (modified) (1 diff)
• stylechanger.js (modified) (5 diffs)
• xpcom_inspector.js (modified) (3 diffs)
• youtubeamp.js (modified) (2 diffs)

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

@@ -83 +83 @@
     ['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));
       }
     },
@@ -94 +94 @@
       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);

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

@@ -304 +304 @@
 // --------------------------
 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);
@@ -312 +312 @@
         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);
         }
     },{
@@ -328 +328 @@
 };
 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('-');
 

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

@@ -312 +312 @@
         var depth = args["-depth"] ? args["-depth"] : "";
         var useVkey = "-vkey" in args;
-        
+
         args.forEach(function(keypair){
             var [lhs, rhs] = keypair.split(",");

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

@@ -211 +211 @@
 // ---------------------------
 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 ){
@@ -269 +269 @@
 ); //}}}
 commands.addUserCommand(['gmlo[ad]'], 'load Greasemonkey scripts', //{{{
-    function(arg, special){
+    function(arg){
         if (!arg) {
             echoerr('Usage: :gmlo[ad][!] {name|filename}');
@@ -285 +285 @@
             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;
@@ -312 +312 @@
 ); //}}}
 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;
@@ -331 +330 @@
         }
         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();
     },{

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

@@ -34 +34 @@
     }
     function makeinc(f, p)
-        function(arg) {
+        function(args) {
             var l = window.content.location;
             var part = l[p];
@@ -43 +43 @@
             }
             if(numreg.test(part)) {
-                arg = arg.arguments[0];
+                arg = args[0];
                 let num = RegExp.$2;
                 let quantity = !arg || isNaN(arg) ? 1 : parseInt(arg);

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

@@ -80 +80 @@
       ['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;
@@ -88 +88 @@
         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 {
@@ -132 +132 @@
       ['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) {

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

@@ -405 +405 @@
     ['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.');
@@ -443 +443 @@
     ['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);
     },

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

@@ -146 +146 @@
 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;
 

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

@@ -92 +92 @@
         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) {

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

@@ -126 +126 @@
 // 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]');
@@ -134 +134 @@
   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;

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

@@ -631 +631 @@
                   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();
               },

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

@@ -195 +195 @@
         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){
@@ -202 +202 @@
                                 }
                                 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){
@@ -212 +212 @@
                                         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]));
@@ -223 +223 @@
                                 } 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]]);
@@ -238 +237 @@
                                         return [0, list1.concat(list2)];
                                 }
-                                if (rel.arguments.length == 2 && rel.arguments[0] == 'clear'){
-                                        for (let name in CSSData){
-                                                if (name.indexOf(rel.arguments[1]) == 0) list2.push([name, CSSData[name]]);
+                                if (args.length == 2 && args[0] == 'clear'){
+                                        for (let name in CSSData){
+                                                if (name.indexOf(args[1]) == 0) list2.push([name, CSSData[name]]);
                                         }
                                         return [6, list2];
-                                } else if (rel.args.length == 1){
-                                        for (let name in CSSData){
-                                                if (name.indexOf(rel.arguments[0]) == 0) list2.push([name, CSSData[name]]);
-                                        }
-                                        if ('clear'.indexOf(rel.arguments[0]) == 0)
+                                } else if (args.args.length == 1){
+                                        for (let name in CSSData){
+                                                if (name.indexOf(args[0]) == 0) list2.push([name, CSSData[name]]);
+                                        }
+                                        if ('clear'.indexOf(args[0]) == 0)
                                                 return [0, list1.concat(list2)];
                                         else

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

@@ -106 +106 @@
 // ----------------------------------------------
 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);
@@ -121 +120 @@
                 }
         }, {
-                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;
@@ -139 +137 @@
                                 position = args[0].length + 1;
                         }
-                        return [position, list];
+                        context.title = ['Name', 'Number'];
+                        context.advance(position);
+                        context.completions = list;
                 }
         }

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

@@ -291 +291 @@
     ['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); }
@@ -308 +308 @@
     ['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); }