Changeset 25492 for lang/javascript/vimperator-plugins

Timestamp:

12/01/08 07:17:10 (6 weeks ago)

Author:

drry

Message:

• fixed a regex.
  
• et cetera.
  

Files:

• lang/javascript/vimperator-plugins/trunk/toggler.js (modified) (8 diffs)

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

@@ -1 @@
-/*
+/**
  * ==VimperatorPlugin==
  * @name toggler
@@ -41 +41 @@
 Toggler.prototype = {
         next: function(notUpdate){
-                let index = this.index + 1;
+                var index = this.index + 1;
                 if (index >= this.cmds.length) index = 0;
                 if (!notUpdate) this.index = index;
@@ -47 +47 @@
         },
         previous: function(notUpdate){
-                let index = this.index - 1;
+                var index = this.index - 1;
                 if (index < 0) index = this.cmds.length -1;
                 if (!notUpdate) this.index = index;
@@ -53 +53 @@
         },
         list: function(){
-                var data = [];
-                for (var i = 0; i<this.cmds.length; i++){
-                        data.push([i==this.index ? "*":"", this.cmds[i]]);
-                }
+                var data = this.cmds.map(function(cmd, i){
+                        return [i==this.index ? "*" : "", cmd];
+                });
                 liberator.echo(template.table(this.name, data), true);
         }
@@ -76 +75 @@
         },
         toggle: function(name, isPrevious){
-                let toggler = this.get(name);
+                var toggler = this.get(name);
                 if (!toggler) return;
-                let cmd = isPrevious ? toggler.previous() : toggler.next();
+                var cmd = isPrevious ? toggler.previous() : toggler.next();
                 if (cmd instanceof Array){
-                        cmd.forEach(function(str){
-                                liberator.execute(str);
-                        });
+                        cmd.forEach(liberator.execute);
                 } else if (typeof cmd == "function"){
                         cmd();
@@ -94 +91 @@
                         return;
                 }
-                for (let i in settings){
-                        settings[i].list();
+                for each (let setting in settings){
+                        setting.list();
                 }
         }
 };
 
-commands.addUserCommand(['toggle'],'setting toggler',
+commands.addUserCommand(["toggle"],"setting toggler",
         function(args){
                 if (args["-list"] || args.length == 0){
@@ -106 +103 @@
                                 liberator.plugins.toggler.list();
                         else
-                                args.forEach(function(name) liberator.plugins.toggler.list(name));
+                                args.forEach(liberator.plugins.toggler.list);
                         return;
                 }
@@ -119 +116 @@
                 ],
                 completer: function(context,args){
-                        let filter = context.filter.split(/\s+/).pop();
-                        let reg = new RegExp(filter ? "^" + flter : ".*", "i");
+                        var filter = context.filter.split(/\s+/).pop();
+                        var reg = new RegExp(filter ? "^" + flter : "");
                         context.title= ["Name", args.bang ? "Previous" : "Next"];
-                        let list = [];
+                        var list = [];
                         for (let i in settings){
                                 let toggler = settings[i];
-                                if (reg.test(i) && !args.some(function(arg) arg==i))
+                                if (reg.test(i.toLowerCase()) && !args.some(function(arg) arg==i))
                                         list.push([i, args.bang ? toggler.previous(true) : toggler.next(true)]);
                         }