* fix typo s/histsio/hintsio/ (thanks tekezo)

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

3 files changed, 59 insertions, 92 deletions

diff --git a/caret-hint.js b/caret-hint.js
index f4e0c76..5bcaaed 100644
--- a/caret-hint.js
+++ b/caret-hint.js
@@ -38,7 +38,7 @@ let PLUGIN_INFO =
   <name>Caret Hint</name>
   <description>Move caret position by hint</description>
   <description lang="ja">Hint を使ってキャレット位置を移動</description>
-  <version>1.3.0</version>
+  <version>1.2.1</version>
   <author mail="anekos@snca.net" homepage="http://d.hatena.ne.jp/nokturnalmortum/">anekos</author>
   <license>new BSD License (Please read the source code comments of this plugin)</license>
   <license lang="ja">修正BSDライセンス (ソースコードのコメントを参照してください)</license>
@@ -110,30 +110,8 @@ let PLUGIN_INFO =
   let selectHeadMode = gval('caret_hint_select_key', '');
   let selectTailMode = gval('caret_hint_select_tail_key', 'S');
   let swapKey = gval('caret_hint_swap_key', 's');
-  let extendLeader = gval('extend_leader', 'c');
   let hintXPath = liberator.globalVariables.caret_hint_xpath || '//*';
 
-  let extendMode = false;
-
-  [headMode, tailMode, selectHeadMode, selectTailMode].forEach(
-    function(mode) {
-      let map = extendLeader + ';' + mode;
-      mappings.remove(modes.NORMAL, map); // for debug
-      mappings.remove(modes.VISUAL, map); // for debug
-      mappings.addUserMap(
-        [modes.NORMAL, modes.VISUAL],
-        [map],
-        'desc',
-        function () {
-          extendMode = true;
-          hints.show(mode);
-        },
-        {
-        }
-      );
-    }
-  );
-
   [
     [[true,  false], headMode],
     [[false, false], tailMode],
@@ -145,10 +123,7 @@ let PLUGIN_INFO =
     hints.addMode(
       m,
       'Move caret position to ' + (h ? 'head' : 'tail') + (s ? ' and Select' : ''),
-      function (elem, loc, count) {
-        moveCaret(elem, h, s);
-        extendMode = false;
-      },
+      function (elem, loc, count) moveCaret(elem, h, s),
       function () hintXPath
     );
   });
@@ -192,9 +167,11 @@ let PLUGIN_INFO =
     r.selectNodeContents(elem);
 
     if (select) {
+      liberator.log('select')
       mappings.getDefault(modes.NORMAL, 'i').action();
       mappings.getDefault(modes.CARET, 'v').action();
     } else {
+      liberator.log('not select')
       if (head) {
         r.setEnd(r.startContainer, r.startOffset);
       } else {
@@ -203,20 +180,10 @@ let PLUGIN_INFO =
       mappings.getDefault(modes.NORMAL, 'i').action();
     }
 
-    if (extendMode) {
-      let a = sel.getRangeAt(0);
-      if (r.compareBoundaryPoints(Range.END_TO_START, a) < 0) {
-        r.setEnd(a.endContainer, a.endOffset);
-      } else {
-        r.setStart(a.startContainer, a.startOffset);
-      }
-    }
-
     sel.addRange(r);
 
     if (select && head)
       swapCaret();
-
   }
 })();
 
diff --git a/char-hints-mod2.js b/char-hints-mod2.js
index 4eb3139..cf07235 100644
--- a/char-hints-mod2.js
+++ b/char-hints-mod2.js
@@ -27,7 +27,7 @@ let g:hintsio:
     - "O" setting char-hint show uppercase.

     Default setting is "IO".

     e.g.)

-      let g:histsio="i"

+      let g:hintsio="i"

 let g:hintlabeling:

     - "s" setting simple n-base decimal hint labeling (n = hintchars.length)

     - "a" setting adjust no overlap labeling

@@ -57,7 +57,7 @@ let g:hintsio:
     - "O" setting char-hint show uppercase.

     Default setting is "IO".

     e.g.)

-      let g:histsio="i"

+      let g:hintsio="i"

 let g:hintlabeling:

     - "s" setting simple n-base decimal hint labeling (n = hintchars.length)

     - "a" setting adjust no overlap labeling

diff --git a/moreqmarks.js b/moreqmarks.js
index 477a437..b579cc0 100644
--- a/moreqmarks.js
+++ b/moreqmarks.js
@@ -33,13 +33,13 @@
     var qmark_queue = [];
 
     // TODO: move to a storage module
-    var savedMarks = liberator.modules.options.getPref("extensions.vimperator.moreqmarks", "").split("\n");
-    var savedMarkStack = liberator.modules.options.getPref("extensions.vimperator.moreqmarkstack", "").split("\n");
-    var savedMarkQueue = liberator.modules.options.getPref("extensions.vimperator.moreqmarkqueue", "").split("\n");
+    var savedMarks = options.getPref("extensions.vimperator.moreqmarks", "").split("\n");
+    var savedMarkStack = options.getPref("extensions.vimperator.moreqmarkstack", "").split("\n");
+    var savedMarkQueue = options.getPref("extensions.vimperator.moreqmarkqueue", "").split("\n");
 
     // load the saved quickmarks -- TODO: change to sqlite
     if(use_default_data) {
-        var defaultMarks = liberator.modules.options.getPref("extensions.vimperator.quickmarks", "").split("\n");
+        var defaultMarks = options.getPref("extensions.vimperator.quickmarks", "").split("\n");
         for (var i = 0; i < defaultMarks.length - 1; i += 2) {
             var url = defaultMarks[i+1];
             qmarks[defaultMarks[i]] = {url: url, x: 0, y: 0};
@@ -117,7 +117,7 @@
     }
     function list_qmarks(marks) {
         if(use_position) {
-            var list = ":" + liberator.modules.util.escapeHTML(liberator.modules.commandline.command) + "<br/>" +
+            var list = ":" + util.escapeHTML(commandline.command) + "<br/>" +
                        "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
             for (var i = 0; i < marks.length; i++)
             {
@@ -125,18 +125,18 @@
                         "<td> "                        + marks[i][0]                              +  "</td>" +
                         "<td align=\"right\">"         + Math.round(marks[i][2] * 100) + "%</td>" +
                         "<td align=\"right\">"         + Math.round(marks[i][3] * 100) + "%</td>" +
-                        "<td style=\"color: green;\">" + liberator.modules.util.escapeHTML(marks[i][1]) + "</td>" +
+                        "<td style=\"color: green;\">" + util.escapeHTML(marks[i][1]) + "</td>" +
                         "</tr>";
             }
             list += "</table>";
             return list;
         } else {
-            var list = ":" + liberator.modules.util.escapeHTML(liberator.modules.commandline.command) + "<br/>" +
+            var list = ":" + util.escapeHTML(commandline.command) + "<br/>" +
                        "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
             for (var i = 0; i < marks.length; i++)
             {
                 list += "<tr><td>    " + marks[i][0] +
-                        "</td><td style=\"color: green;\">" + liberator.modules.util.escapeHTML(marks[i][1]) + "</td></tr>";
+                        "</td><td style=\"color: green;\">" + util.escapeHTML(marks[i][1]) + "</td></tr>";
             }
             list += "</table>";
             return list;
@@ -148,10 +148,10 @@
         var y = item.y;
         if (url) {
             if(find) {
-                for (let [number, browser] in Iterator(liberator.modules.tabs.browsers)) {
+                for (let [number, browser] in Iterator(tabs.browsers)) {
                     var marked_url = browser.contentDocument.location.href;
                     if(marked_url == url) {
-                        liberator.modules.tabs.select(number, false);
+                        tabs.select(number, false);
                         var win = getBrowser().selectedTab.linkedBrowser.contentWindow;
                         if(use_position) {
                             if(x!=0 || y!=0) {
@@ -194,7 +194,7 @@
                     savedQuickMarkStack += qmark_stack[mark].x + "\n";
                     savedQuickMarkStack += qmark_stack[mark].y + "\n";
                 }
-                liberator.modules.options.setPref("extensions.vimperator.moreqmarkstack", savedQuickMarkStack);
+                options.setPref("extensions.vimperator.moreqmarkstack", savedQuickMarkStack);
                 break;
             case "queue":
                 var savedQuickMarkQueue = "";
@@ -203,7 +203,7 @@
                     savedQuickMarkQueue += qmark_queue[mark].x + "\n";
                     savedQuickMarkQueue += qmark_queue[mark].y + "\n";
                 }
-                liberator.modules.options.setPref("extensions.vimperator.moreqmarkqueue", savedQuickMarkQueue);
+                options.setPref("extensions.vimperator.moreqmarkqueue", savedQuickMarkQueue);
                 break;
             case "mark":
             default:
@@ -214,14 +214,14 @@
                     savedQuickMarks += qmarks[mark].x + "\n";
                     savedQuickMarks += qmarks[mark].y + "\n";
                 }
-                liberator.modules.options.setPref("extensions.vimperator.moreqmarks", savedQuickMarks);
+                options.setPref("extensions.vimperator.moreqmarks", savedQuickMarks);
                 if(use_default_data) {
                     var savedQuickMarks = "";
                     for (var mark in qmarks) {
                         savedQuickMarks += mark + "\n";
                         savedQuickMarks += qmarks[mark].url + "\n";
                     }
-                    liberator.modules.options.setPref("extensions.vimperator.quickmarks", savedQuickMarks);
+                    options.setPref("extensions.vimperator.quickmarks", savedQuickMarks);
                 }
                 break;
         }
@@ -264,85 +264,85 @@
 
     //// MAPPINGS
 
-    var modes = [liberator.modules.modes.NORMAL];
+    var modes = [modes.NORMAL];
 
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gj"], "Jump to QuickMark for current URL",
         function (arg)
         {
-            var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            liberator.modules.quickmarks.jumpTo(arg, where, true);
+            var where = /\bquickmark\b/.test(options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
+            quickmarks.jumpTo(arg, where, true);
         },
-        { flags: liberator.modules.Mappings.flags.ARGUMENT });
+        { flags: mappings.flags.ARGUMENT });
 
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gd"], "Delete QuickMark for current URL",
         function ()
         {
-            liberator.plugins.moreqmarks.remove('', liberator.modules.buffer.URL);
+            plugins.moreqmarks.remove('', buffer.URL);
         });
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gs"], "Push QuickMarkStack for current URL",
         function ()
         {
-            liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "stack");
+            plugins.moreqmarks.add("", buffer.URL, "stack");
         });
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gS"], "Pop QuickMarkStack and Jump",
         function ()
         {
-            var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            if(liberator.modules.quickmarks.jumpTo("", where, true, "stack")) {
-                liberator.modules.quickmarks.remove("", "", "stack");
+            var where = /\bquickmark\b/.test(options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
+            if(quickmarks.jumpTo("", where, true, "stack")) {
+                quickmarks.remove("", "", "stack");
             }
         });
 
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gq"], "Queue QuickMarkQueue for current URL",
         function ()
         {
-            liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "queue");
+            liberator.plugins.moreqmarks.add("", buffer.URL, "queue");
         });
-    liberator.modules.mappings.addUserMap(modes,
+    mappings.addUserMap(modes,
         ["gQ"], "Dequeue QuickMarkStack and Jump",
         function ()
         {
-            var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            if(liberator.modules.quickmarks.jumpTo("", where, true, "queue")) {
-                liberator.modules.quickmarks.remove("", "", "queue");
+            var where = /\bquickmark\b/.test(options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
+            if(quickmarks.jumpTo("", where, true, "queue")) {
+                quickmarks.remove("", "", "queue");
             }
         });
 
     //// COMMANDS
 
-    liberator.modules.commands.add(["qmarkpu[sh]", "qmpu[sh]"], "Push QuickMarkStack for current URL",
+    commands.add(["qmarkpu[sh]", "qmpu[sh]"], "Push QuickMarkStack for current URL",
         function ()
         {
-            liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "stack");
+            liberator.plugins.moreqmarks.add("", buffer.URL, "stack");
         });
-    liberator.modules.commands.add(["qmarkpo[p]", "qmpo[p]"], "Pop QuickMarkStack and Jump",
+    commands.add(["qmarkpo[p]", "qmpo[p]"], "Pop QuickMarkStack and Jump",
         function ()
         {
-            var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            liberator.modules.quickmarks.jumpTo("", where, true, "stack");
+            var where = /\bquickmark\b/.test(options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
+            quickmarks.jumpTo("", where, true, "stack");
         });
-    liberator.modules.commands.add(["stackli[st]", "stls"], "List QuickMarkStack",
+    commands.add(["stackli[st]", "stls"], "List QuickMarkStack",
         function ()
         {
             liberator.plugins.moreqmarks.list("", "stack");
         });
-    liberator.modules.commands.add(["qmarkqu[eue]", "qmqu[eue]"], "Queue QuickMarkQueue for current URL",
+    commands.add(["qmarkqu[eue]", "qmqu[eue]"], "Queue QuickMarkQueue for current URL",
         function ()
         {
-            liberator.plugins.moreqmarks.add("", liberator.modules.buffer.URL, "queue");
+            liberator.plugins.moreqmarks.add("", buffer.URL, "queue");
         });
-    liberator.modules.commands.add(["qmarkde[que]", "qmde[que]"], "Dequeue QuickMarkStack and Jump",
+    commands.add(["qmarkde[que]", "qmde[que]"], "Dequeue QuickMarkStack and Jump",
         function ()
         {
-            var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
-            liberator.modules.quickmarks.jumpTo("", where, true, "queue");
+            var where = /\bquickmark\b/.test(options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
+            quickmarks.jumpTo("", where, true, "queue");
         });
-    liberator.modules.commands.add(["queueli[st]", "quli[st]"], "List QuickMarkQueue",
+    commands.add(["queueli[st]", "quli[st]"], "List QuickMarkQueue",
         function ()
         {
             liberator.plugins.moreqmarks.list("", "queue");
@@ -366,11 +366,11 @@
                 }
                 add_qmark(qmark, {url: url, x: x, y: y}, target);
                 var message = (target?target+" : ":"add : "+qmark+" | ")+"("+x*100+"%, "+y*100+"%) | "+url;
-                liberator.modules.commandline.echo(message, liberator.modules.commandline.HL_INFOMSG)
+                commandline.echo(message, commandline.HL_INFOMSG)
             } else {
                 add_qmark(qmark, {url: url, x: 0, y: 0}, target);
                 var message = (target?target+" : ":"add : "+qmark+" | ")+url;
-                liberator.modules.commandline.echo(message, liberator.modules.commandline.HL_INFOMSG);
+                commandline.echo(message, commandline.HL_INFOMSG);
             }
             save_qmarks(target);
         },
@@ -381,7 +381,7 @@
             switch(target) {
                 case "stack":
                     if(item = qmark_stack.pop()) {
-                        liberator.modules.commandline.echo("pop "+item.url, liberator.modules.commandline.HL_INFOMSG);
+                        commandline.echo("pop "+item.url, commandline.HL_INFOMSG);
                         save_qmarks("stack");
                     } else {
                         liberator.echoerr('No QuickStack set');
@@ -390,7 +390,7 @@
                 case "queue":
                     var item;
                     if(item = qmark_queue.pop()) {
-                        liberator.modules.commandline.echo("dequeue "+item.url, liberator.modules.commandline.HL_INFOMSG);
+                        commandline.echo("dequeue "+item.url, commandline.HL_INFOMSG);
                         save_qmarks("queue");
                     } else {
                         liberator.echoerr('No QuickQueue set');
@@ -402,7 +402,7 @@
                         for(var mark in qmarks) {
                             if(url == qmarks[mark].url) {
                                 delete qmarks[mark];
-                                liberator.modules.commandline.echo("delete qmark "+mark, liberator.modules.commandline.HL_INFOMSG);
+                                commandline.echo("delete qmark "+mark, commandline.HL_INFOMSG);
                                 save_qmarks("mark");
                                 return;
                             }
@@ -414,7 +414,7 @@
                         for (var qmark in qmarks) {
                             if (pattern.test(qmark)) {
                                 delete qmarks[qmark];
-                                liberator.modules.commandline.echo("delete qmark "+qmark, liberator.modules.commandline.HL_INFOMSG);
+                                commandline.echo("delete qmark "+qmark, commandline.HL_INFOMSG);
                                 save_qmarks("mark");
                                 return;
                             }
@@ -482,7 +482,7 @@
             }
 
             var list = list_qmarks(marks);
-            liberator.modules.commandline.echo(list, liberator.modules.commandline.HL_NORMAL, liberator.modules.commandline.FORCE_MULTILINE);
+            commandline.echo(list, commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
         },
 
         destroy: function ()
@@ -494,7 +494,7 @@
         }
     };
     for(var name in liberator.plugins.moreqmarks) {
-        liberator.modules.quickmarks[name] = liberator.plugins.moreqmarks[name];
+        quickmarks[name] = liberator.plugins.moreqmarks[name];
     }
 })();
 // vim: set sw=4 ts=4 et: