From e218b1c97b02b7d09ac7625ab079ea13ccc084aa Mon Sep 17 00:00:00 2001
From: anekos
Date: Mon, 28 Mar 2011 16:44:11 +0900
Subject: 3.1 対応

---
 caret-hint.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'caret-hint.js')

diff --git a/caret-hint.js b/caret-hint.js
index 3d33067..4693945 100644
--- a/caret-hint.js
+++ b/caret-hint.js
@@ -44,7 +44,7 @@ let PLUGIN_INFO =
   <license lang="ja">修正BSDライセンス (ソースコードのコメントを参照してください)</license>
   <updateURL>https://github.com/vimpr/vimperator-plugins/raw/master/caret-hint.js</updateURL>
   <minVersion>2.0pre</minVersion>
-  <maxVersion>2.3</maxVersion>
+  <maxVersion>3.1</maxVersion>
   <detail><![CDATA[
     Move caret position by hint.
     == Global Variables ==
@@ -184,6 +184,10 @@ let PLUGIN_INFO =
     s.extend.apply(s, a);
   }
 
+  // Vimperator 3.0 までと 3.1 以降に両対応
+  const [CaretKey, VisualKey] =
+    /caret/(mappings.getDefault(modes.NORMAL, 'i').description) ? ['i', 'v'] : ['c', 'v'];
+
   function moveCaret (elem, head, select) {
     let doc = elem.ownerDocument;
     let win = new XPCNativeWrapper(window.content.window);
@@ -194,15 +198,15 @@ let PLUGIN_INFO =
     r.selectNodeContents(elem);
 
     if (select) {
-      mappings.getDefault(modes.NORMAL, 'i').action();
-      mappings.getDefault(modes.CARET, 'v').action();
+      mappings.getDefault(modes.NORMAL, CaretKey).action();
+      mappings.getDefault(modes.CARET, VisualKey).action();
     } else {
       if (head) {
         r.setEnd(r.startContainer, r.startOffset);
       } else {
         r.setStart(r.endContainer, r.endOffset);
       }
-      mappings.getDefault(modes.NORMAL, 'i').action();
+      mappings.getDefault(modes.NORMAL, CaretKey).action();
     }
 
     if (extendMode) {
-- 
cgit v1.2.3