Changeset 24976 for lang/javascript/vimperator-plugins

Timestamp:

11/27/08 00:02:44 (6 weeks ago)

Author:

pekepeke

Message:

2.0pre対応
refcontrol, autoproxychanger 追加

Location:

lang/javascript/vimperator-plugins/trunk

Files:

• autoproxychanger.js (added)
• commandBookmarklet.js (modified) (1 diff)
• copy.js (modified) (1 diff)
• direct_bookmark.js (modified) (2 diffs)
• direct_hb.js (modified) (4 diffs)
• encodingSwitcherCommand.js (modified) (4 diffs)
• ldrize_cooperation.js (modified) (2 diffs)
• localkeymode.js (modified) (3 diffs)
• refcontrol.js (added)

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

@@ -18 +18 @@
   }
 
+  const regex = /[^a-zA-Z]/;
   items.forEach(function(item) {
     var [url, title] = [item.url, item.title];
     var desc = title;
     title = escape( title.replace(/ +/g,'').toLowerCase() );
-    if (/[^a-zA-Z]+/.test(title)) {
+    if (regex.test(title)) {
         title = "bm"+title.replace(/[^a-zA-Z]+/g,'');
         title = title.substr(0, title.length>50?50:title.length);

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

@@ -92 +92 @@
                 [template.label, liberator.modules.util.escapeString(template.value, '"')]
             );
-            if (!context.filter){ context.items = templates; return; }
+            if (!context.filter){ context.completions = templates; return; }
             var candidates = [];
-            context.items = completion.filter(templates, context.filter, true);
+            context.completions = completion.filter(templates, context.filter, true);
         },
         bang: true

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

@@ -633 +633 @@
             setTimeout(function(){first.call();},0);
         },{
-            completer: function(filter){
+            completer: function(context, arg, special){
+                let filter = context.filter;
                 var match_result = filter.match(/((?:\[[^\]]*\])*)\[?(.*)/); //[all, commited, now inputting]
                 var m = new RegExp(XMigemoCore && isUseMigemo ? "^(" + XMigemoCore.getRegExp(match_result[2]) + ")" : "^" + match_result[2],'i');
@@ -639 +640 @@
                 if(liberator.plugins.direct_bookmark.tags.length == 0)
                     getTags().call([]);
-                return [match_result[1].length, [["[" + tag + "]","Tag"]
-                            for each (tag in liberator.plugins.direct_bookmark.tags) if (m.test(tag) && match_result[1].indexOf('[' + tag + ']') < 0)]];
+                context.title = ['Tag','Description'];
+                context.advance( match_result[1].length );
+                context.completions = [["[" + tag + "]","Tag"]
+                            for each (tag in liberator.plugins.direct_bookmark.tags) if (m.test(tag) && match_result[1].indexOf('[' + tag + ']') < 0)];
             },
             options: [

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

@@ -149 +149 @@
                 function(mypage_text){
                     var mypage_html = parseHTML(mypage_text);
-                    var tags = getElementsByXPath("//ul[@id=\"taglist\"]/li/a",mypage_html);
+                    var tags = getElementsByXPath("//ul[@id=\"tags\"]/li/a",mypage_html);
                     tags.forEach(function(tag){
                         liberator.plugins.hatena_tags.push(tag.innerHTML);
@@ -186 +186 @@
     );
     commands.addUserCommand(['hb'],"Post to HatenaBookmark",
-        function(arg){
+        function(args){
+            var arg = args.string;
             try {
                 var passwordManager = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
@@ -197 +198 @@
             catch(ex){
             }
-            addHatenaBookmarks(hatenaUser,hatenaPassword,liberator.buffer.URL,arg,isNormalize);
+            addHatenaBookmarks(hatenaUser,hatenaPassword,modules.buffer.URL,arg,isNormalize);
         },{
-            completer: function(filter){
+            completer: function(context, arg, special){
+                let filter = context.filter;
                 //var match_result = filter.match(/(.*)\[(\w*)$/); //[all, commited, now inputting]
                 var match_result = filter.match(/((?:\[[^\]]*\])+)?\[?(.*)/); //[all, commited, now inputting]
@@ -210 +212 @@
                     }
                 });
-                return [0, completionList];
+                context.title = ['Tag','Description'];
+//                context.advance(match_result[1].length);
+                context.completions = completionList;
             }
         }

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

@@ -97 +97 @@
     },
     {
-        completer: function(filter)
-            [0,completion( encodings, filter)]
+        completer: function(context, arg, special){
+            let filter = context.filter;
+            context.completions = completion( encodings, filter);
+                }
     }
 );
@@ -127 +129 @@
     },
     {
-        completer: function(filter)
-            [0,completion( detectors, filter)]
+        completer: function(context, arg, special){
+            let filter = context.filter;
+            context.completions = completion( detectors, filter);
+                }
     }
 );
@@ -154 +158 @@
         listCharset(arg, liberator.modules.options.fileencoding, encodings);
     },{
-        completer: function(filter)
-            [0,completion(encodings, filter)]
+        completer: function(context, arg, special){
+            let filter = context.filter;
+            context.completions = completion( encodings, filter);
+                }
     }
 );
@@ -163 +169 @@
         listCharset(arg, liberator.modules.options.autodetector, detectors);
     },{
-        completer: function(filter)
-            [0,completion(detectors, filter)]
+        completer: function(context, arg, special){
+            let filter = context.filter;
+            context.completions = completion( detectors, filter);
+                }
     }
 );

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

@@ -269 +269 @@
                 function(arg){self.Minibuffer.execute(arg.string)},
                 {
-                    completer: function(filter){
+                    completer: function(context, arg, special){
+                        let filter = context.filter;
                         var completionList = [];
                         var command = self.Minibuffer.command;
@@ -277 +278 @@
                         for(let i in command) if(exp.test(i))completionList.push([tokens.concat(i).join(" | "),"MinibufferCommand"]);
                         for(let i in alias) if(exp.test(i))completionList.push([i,"MinibufferAlias"]);
-                        return [0,completionList];
+                        context.title = ['Minibuffer Command', 'Description'];
+                        context.completions = completionList;
                     }
                 });

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

@@ -43 +43 @@
  *
  *  備考:
- *   * 
+ *   *
  */
 liberator.plugins.LocalKeyMode = (function() {
-  
+
   // アイコン定義
   const DISABLE_ICON = 'data:image/png;base64,'
-    +'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEUAAAABAQECAgIDAwMEBAQF'
-    +'BQUGBgYHBwcICAgJCQkKCgoLCwsMDAwNDQ0ODg4PDw8QEBARERESEhITExMUFBQVFRUWFhYXFxcY'
-    +'GBgZGRkaGhobGxscHBwdHR0eHh4fHx8gICAhISEiIiIjIyMkJCQlJSUmJiYnJycoKCgpKSkqKior'
-    +'KyssLCwtLS0uLi4vLy8wMDAxMTEyMjIzMzM0NDQ1NTU2NjY3Nzc4ODg5OTk6Ojo7Ozs8PDw9PT0+'
-    +'Pj4/Pz9AQEBBQUFCQkJDQ0NERERFRUVGRkZHR0dISEhJSUlKSkpLS0tMTExNTU1OTk5PT09QUFBR'
-    +'UVFSUlJTU1NUVFRVVVVWVlZXV1dYWFhZWVlaWlpbW1tcXFxdXV1eXl5fX19gYGBhYWFiYmJjY2Nk'
-    +'ZGRlZWVmZmZnZ2doaGhpaWlqampra2tsbGxtbW1ubm5vb29wcHBxcXFycnJzc3N0dHR1dXV2dnZ3'
-    +'d3d4eHh5eXl6enp7e3t8fHx9fX1+fn5/f3+AgICBgYGCgoKDg4OEhISFhYWGhoaHh4eIiIiJiYmK'
-    +'ioqLi4uMjIyNjY2Ojo6Pj4+QkJCRkZGSkpKTk5OUlJSVlZWWlpaXl5eYmJiZmZmampqbm5ucnJyd'
-    +'nZ2enp6fn5+goKChoaGioqKjo6OkpKSlpaWmpqanp6eoqKipqamqqqqrq6usrKytra2urq6vr6+w'
-    +'sLCxsbGysrKzs7O0tLS1tbW2tra3t7e4uLi5ubm6urq7u7u8vLy9vb2+vr6/v7/AwMDBwcHCwsLD'
-    +'w8PExMTFxcXGxsbHx8fIyMjJycnKysrLy8vMzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW'
-    +'1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp'
-    +'6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8'
-    +'/Pz9/f3+/v7////isF19AAAAPElEQVR4nGNYgwYYsAv8/48Q6AeB///7YQBToAkE/v9vggFMgRIQ'
-    +'+P+/BAYwBQibgcsdEAASmIsGCAsAAE8ZnUuRMbA8AAAAAElFTkSuQmCC';
+    +'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAZ0lEQVR4nGNcvXo1AymAiSTV'
+    +'WDSEhISEhITg0cDy+PFjTFGsgmQ6ieXz58+YolgFybXh06dPmKJYBcm1gY+PD1MUqyC5NvDy'
+    +'8mKKYhWEasAqWlhYiCbS398PYTDOmTOHJCdRnPgIAgBfBxpKyax43AAAAABJRU5ErkJg'
+    +'gg==';
   const ENABLE_ICON = 'data:image/png;base64,'
     +'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAa0lEQVR4nGP0+OzAQApgIkk1Fg3b'
@@ -74 +62 @@
     + 'MCJ7CSOEZqR/4iMEAOh5DfER9lQKAAAAAElFTkSuQmCC';
   const rhsRegExp = /[ \r\n]+/g;
-  
+
   var _isEnable;
   var _isBindLocalKey = false;
@@ -313 +301 @@
           }
         }, {
-          completer: function(filter) {
+          completer: function(context, arg, special){
+            let filter = context.filter;
             var names = self.completeNames;
-            if (!filter) return [0, names];
+            context.title = ['Name','Description'];
+            if (!filter) {
+              context.completions = names;
+              return;
+            }
             filter = filter.toLowerCase();
-            return [0, names.filter( function(el)
-              el[0].toLowerCase().indexOf(filter) == 0) ];
+            context.completions = names.filter( function(el) el[0].toLowerCase().indexOf(filter) == 0);
           }
         } );