Changeset 36020

Show
Ignore:
Timestamp:
11/28/09 08:15:52 (3 years ago)
Author:
anekos
Message:

Follow tip

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r35099 r36020  
    11/* {{{ 
    2 Copyright (c) 2008, anekos. 
     2Copyright (c) 2008-2009, anekos. 
    33All rights reserved. 
    44 
    … …  
    4040  <description>Migemize default page search.</description> 
    4141  <description lang="ja">デフォルトのドキュメント内検索をミゲマイズする。</description> 
    42   <version>2.9.3</version> 
     42  <version>2.9.4</version> 
    4343  <author mail="anekos@snca.net" homepage="http://d.hatena.ne.jp/nokturnalmortum/">anekos</author> 
    4444  <license>new BSD License (Please read the source code comments of this plugin)</license> 
    4545  <license lang="ja">修正BSDライセンス (ソースコードのコメントを参照してください)</license> 
    4646  <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/migemized_find.js</updateURL> 
    47   <minVersion>2.0pre</minVersion> 
    48   <maxVersion>2.0pre</maxVersion> 
     47  <minVersion>2.3</minVersion> 
     48  <maxVersion>2.3</maxVersion> 
    4949  <detail><![CDATA[ 
    5050    == Usage == 
    … …  
    575575    }, 
    576576 
    577     searchSubmitted: function searchSubmitted (command, forcedBackward) { 
     577    onSubmit: function searchSubmitted (command, forcedBackward) { 
    578578      if (delayCallTimer) { 
    579579        delayCallTimer = null; 
    … …  
    585585    }, 
    586586 
    587     searchCanceled: function searchCanceled () { 
     587    onCancel: function searchCanceled () { 
    588588      MF.cancel(); 
    589589    }, 
    590590 
    591     searchKeyPressed: function (str) { 
    592       _findFirst(str, _backwards); 
     591    onKeyPress: function (str) { 
     592      liberator.log('onKeyPress'); 
     593      if (typeof str == 'string') { 
     594        liberator.log('findFirst'); 
     595        _findFirst(str, _backwards); 
     596      } else if (str === false) 
     597        MF.findAgain(); 
    593598    }, 
    594599  }; 
    595600 
    596  
    597   // XXX for 2.1pre 
    598   // そのうち消す？ 
    599   // http://vimperator.g.hatena.ne.jp/hogelog/20090511/1242060081 
    600   if (typeof search == "undefined") { 
    601     migemized.onSubmit = migemized.searchSubmitted; 
    602     migemized.onCancel = migemized.searchCanceled; 
    603     migemized.onKeyPress = migemized.searchKeyPressed; 
    604     var search = finder; 
    605   } 
    606  
    607   // オリジナルの状態に戻せるように保存しておく 
    608   let (original = {}) { 
    609     for (let name in migemized) 
    610       original[name] = search[name]; 
    611  
    612     function set (funcs) { 
    613       for (let name in funcs) 
    614         search[name] = funcs[name]; 
    615     } 
    616  
    617     if (do_install) 
    618       set(migemized); 
    619  
    620     MF.install = function () set(migemized); 
    621     MF.uninstall = function () set(original); 
    622   } 
    623  
     601  commandline.registerCallback("change", modes.SEARCH_FORWARD, migemized.onKeyPress); 
     602  commandline.registerCallback("submit", modes.SEARCH_FORWARD, migemized.onSubmit); 
     603  commandline.registerCallback("cancel", modes.SEARCH_FORWARD, migemized.onCancel); 
     604  commandline.registerCallback("change", modes.SEARCH_BACKWARD, migemized.onKeyPress); 
     605  commandline.registerCallback("submit", modes.SEARCH_BACKWARD, migemized.onSubmit); 
     606  commandline.registerCallback("cancel", modes.SEARCH_BACKWARD, migemized.onCancel); 
     607 
     608  finder.findAgain = migemized.findAgain; 
    624609 
    625610  // highlight コマンド