From 120d37a31fd7280151e56ea1846bed438c359efc Mon Sep 17 00:00:00 2001
From: anekos
Date: Thu, 9 Jun 2011 07:19:01 +0900
Subject: Vimperator の変更に対応

---
 migemized_find.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'migemized_find.js')

diff --git a/migemized_find.js b/migemized_find.js
index 3e9a16b..351d913 100644
--- a/migemized_find.js
+++ b/migemized_find.js
@@ -578,8 +578,8 @@ let PLUGIN_INFO =
       MF.cancel();
     },
 
-    onKeyPress: function (str) {
-      liberator.log('onKeyPress');
+    onChange: function (str) {
+      liberator.log('onChange');
       if (typeof str == 'string') {
         liberator.log('findFirst');
         _findFirst(str, _backwards);
@@ -588,15 +588,21 @@ let PLUGIN_INFO =
     },
   };
 
-  commandline.registerCallback("change", modes.SEARCH_FORWARD, migemized.onKeyPress);
-  commandline.registerCallback("submit", modes.SEARCH_FORWARD, migemized.onSubmit);
-  commandline.registerCallback("cancel", modes.SEARCH_FORWARD, migemized.onCancel);
-  commandline.registerCallback("change", modes.SEARCH_BACKWARD, migemized.onKeyPress);
-  commandline.registerCallback("submit", modes.SEARCH_BACKWARD, migemized.onSubmit);
-  commandline.registerCallback("cancel", modes.SEARCH_BACKWARD, migemized.onCancel);
-
   finder.findAgain = migemized.findAgain;
 
+  plugins.libly.$U.around(
+    finder,
+    'openPrompt',
+    function (next, [mode]) {
+      let res = next();
+      plugins.libly.$U.around(commandline._input, 'change', function (next, [str]) migemized.onChange(str));
+      plugins.libly.$U.around(commandline._input, 'submit', function (next, [str]) migemized.onSubmit(str));
+      plugins.libly.$U.around(commandline._input, 'cancel', function (next, [str]) migemized.onCancel());
+      return res;
+    },
+    true
+  );
+
   // highlight コマンド
   commands.addUserCommand(
     ['ml', 'migelight'],
@@ -611,7 +617,8 @@ let PLUGIN_INFO =
       options: [
         [['-color', '-c'], commands.OPTION_STRING, null, colorsCompltions],
       ]
-    }
+    },
+    true
   );
 
   // remove highlight コマンド
@@ -647,7 +654,8 @@ let PLUGIN_INFO =
         [['-backward', '-b'], commands.OPTION_NOARG],
         [['-color', '-c'], commands.OPTION_STRING, null, colorsCompltions],
       ]
-    }
+    },
+    true
   );
 
   // 外から使えるように
-- 
cgit v1.2.3


From d16ecfbc59d5e4b573946e7185382f6464614a2f Mon Sep 17 00:00:00 2001
From: anekos
Date: Thu, 9 Jun 2011 07:19:45 +0900
Subject: いらんログ削除

---
 migemized_find.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'migemized_find.js')

diff --git a/migemized_find.js b/migemized_find.js
index 351d913..f6f9f4b 100644
--- a/migemized_find.js
+++ b/migemized_find.js
@@ -39,13 +39,12 @@ let PLUGIN_INFO =
   <name lang="ja">Migemized Find</name>
   <description>Migemize default page search.</description>
   <description lang="ja">デフォルトのドキュメント内検索をミゲマイズする。</description>
-  <version>2.10.1</version>
+  <version>2.10.2</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>
   <updateURL>https://github.com/vimpr/vimperator-plugins/raw/master/migemized_find.js</updateURL>
   <minVersion>3.0</minVersion>
-  <maxVersion>3.0</maxVersion>
   <detail><![CDATA[
     == Usage ==
       検索ワードの一文字目が
@@ -579,9 +578,7 @@ let PLUGIN_INFO =
     },
 
     onChange: function (str) {
-      liberator.log('onChange');
       if (typeof str == 'string') {
-        liberator.log('findFirst');
         _findFirst(str, _backwards);
       } else if (str === false)
         MF.findAgain();
-- 
cgit v1.2.3