Changeset 17562

Timestamp:

08/13/08 05:23:57 (5 months ago)

Author:

anekos

Message:

キャンセルしたときに検索文字列をリセットするようにした。
見つからないときにエラーメッセージを出すようにした。

Files:

• lang/javascript/vimperator-plugins/trunk/migemized_find.js (modified) (3 diffs)

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

@@ -25 +25 @@
   // findMode := FIND_MODE_NATIVE | FIND_MODE_MIGEMO | FIND_MODE_REGEXP 
 
+  let elem = document.getElementById('FindToolbar').getElement('findbar-textbox');
+  const DOMUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"].
+                      getService(Components.interfaces["inIDOMUtils"]);
+
+  let previousKeyword = null;
   let lastKeyword = null;
   let original = {};
+
+  const findbarTextbox = document.getElementById('FindToolbar').getElement('findbar-textbox');
+
+  // アレな方法で not found を検出
+  function isNotFound () {
+    let rules = DOMUtils.getCSSStyleRules(elem);
+    for (let i = 0; i < rules.Count(); i++) {
+      if (rules.GetElementAt(i).selectorText.indexOf('notfound') >= 0)
+        return true;
+    }
+  }
 
   // 検索文字列から検索モードと検索文字列を得る。
@@ -48 +64 @@
         return;
       XMigemoFind.findMode = mode;
-      XMigemoFind.find(backwards, lastKeyword = word, true);
+      let found = XMigemoFind.find(backwards, lastKeyword = word, true);
+      liberator.log(XMigemoFind.NOTFOUND);
     },
 
     findAgain: function findAgain (reverse) {
-      XMigemoFind.find(reverse, lastKeyword, true);
+      let found = XMigemoFind.find(reverse, lastKeyword || previousKeyword, true);
+      liberator.log(XMigemoFind.NOTFOUND);
     },
 
     searchSubmitted: function searchSubmitted (command, forcedBackward) {
+      previousKeyword = lastKeyword;
       XMigemoFind.clear(false);
       liberator.modes.reset();
@@ -61 +80 @@
 
     searchCanceled: function searchCanceled () {
+      lastKeyword = null;
       XMigemoFind.clear(false);
     },