From 42a60fe0ad4c2b1556cf83f130307d739fab6e5d Mon Sep 17 00:00:00 2001
From: hogelog
Date: Tue, 10 Feb 2009 02:02:03 +0000
Subject:  * fix select long hint-label bug when g:hintchars = str (str.length
 < 10)

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@29812 d0d07461-0603-4401-acd4-de1884942a52
---
 char-hints-mod2.js | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'char-hints-mod2.js')

diff --git a/char-hints-mod2.js b/char-hints-mod2.js
index d8223ed..4eb3139 100644
--- a/char-hints-mod2.js
+++ b/char-hints-mod2.js
@@ -4,9 +4,9 @@ var PLUGIN_INFO =
     <name>{NAME}</name>
     <description>character hint mode.</description>
     <author mail="konbu.komuro@gmail.com" homepage="http://d.hatena.ne.jp/hogelog/">hogelog</author>
-    <version>0.2.6</version>
+    <version>0.2.7</version>
     <minVersion>2.0pre 2008/12/12</minVersion>
-    <maxVersion>2.0a1</maxVersion>
+    <maxVersion>2.0pre</maxVersion>
     <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/char-hints-mod2.js</updateURL>
     <detail><![CDATA[
 == Usage ==
@@ -35,6 +35,9 @@ let g:hintlabeling:
     e.g.)
       let g:hintlabeling="a"
 
+== TODO ==
+- fix bug that hinttimeout don't run
+
      ]]></detail>
     <detail lang="ja"><![CDATA[
 == Usage ==
@@ -62,6 +65,9 @@ let g:hintlabeling:
     e.g.)
       let g:hintlabeling="a"
 
+== TODO ==
+- fix bug that hinttimeout don't run
+
      ]]></detail>
 </VimperatorPlugin>;
 //}}}
@@ -166,14 +172,19 @@ let g:hintlabeling:
         let start = getStartCount(hintchars.length, hints.length);
         let num = chars2num(hintInput)-start;
         if(num < 0) return;
+
         let numstr = String(num);
         for(let i=0,l=numstr.length;i<l;++i) {
             let num = numstr[i];
+            // events.toString(e) return e.liberatorString
+            // if e.liberatorString.
+            // so alt handled as press number event by vimperator.
             let alt = new Object;
             alt.liberatorString = num;
             charhints.original.onEvent(alt);
         }
         statusline.updateInputBuffer(hintInput);
+
         let validHints = hints.filter(function(hint) isValidHint(hintInput, hint));
         if(validHints.length == 1) {
             charhints.original.processHints(true);
@@ -198,7 +209,9 @@ let g:hintlabeling:
             }
             let hintString = commandline.command;
             commandline.command = hintString.replace(inputRegex, "");
+
             charhints.original.onInput(event);
+
             for(let i=0,l=hintString.length;i<l;++i) {
                 if(inputRegex.test(hintString[i])) {
                     hintInput += hintString[i];
@@ -217,6 +230,16 @@ let g:hintlabeling:
                 statusline.updateInputBuffer(hintInput);
             }
         }, //}}}
+        processHints: function (followFirst) //{{{
+        {
+            // don't followFirst if processHints call from
+            // charhints.original.onEvent(alt) in processHintInput
+            let caller = arguments.callee.caller;
+            if(caller == charhints.original.onEvent && caller.caller == processHintInput)
+                return charhints.original.processHints(false);
+
+            return charhints.original.processHints(followFirst);
+        }, //}}}
     };
 
     if(!charhints.original) {
@@ -232,6 +255,7 @@ let g:hintlabeling:
             hints.show = charhints.show;
             hints.onEvent = charhints.onEvent;
             liberator.eval("onInput = plugins.charhints.onInput", hintContext);
+            liberator.eval("processHints = plugins.charhints.processHints", hintContext);
 
             liberator.execute(":hi Hint::after content: attr(hintchar)", true, true);
             if(liberator.globalVariables.hintsio) {
@@ -258,8 +282,9 @@ let g:hintlabeling:
             hints.show = charhints.original.show;
             hints.onEvent = charhints.original.onEvent;
             liberator.eval("onInput = plugins.charhints.original.onInput", hintContext);
+            liberator.eval("processHints = plugins.charhints.original.processHints", hintContext);
 
-            liberator.execute(":hi Hint::after content: attr(number)");
+            liberator.execute(":hi Hint::after content: attr(number)", true, true);
         }; //}}}
     }
     charhints.install();
-- 
cgit v1.2.3