[Pkg-mozext-commits] [nostalgy] 185/235: Remove the 'always show search mode' option.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository nostalgy.

commit f855bcc52de98b70db6953c2d4192b8cc1e1b7c2
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Dec 23 13:16:39 2009 +0000

    Remove the 'always show search mode' option.
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@185 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 content/edit_prefs.xul |    9 ---------
 content/folders.js     |    5 +----
 content/nostalgy.js    |   14 +-------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 46a801b..56cdeb9 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -22,7 +22,6 @@
  <tabs>
  <tab label="Rules"/>
  <tab label="Completion"/>
- <tab label="UI"/>
  <tab label="Keys"/>
  </tabs>
  <tabpanels>
@@ -90,14 +89,6 @@ shortcuts to move/copy the message to this folder.</label>
 
  <tabpanel>
  <groupbox flex="1">
-   <checkbox label="Always show the criterion selection menu when Quick Search is focused"
-             id="always_show_search_mode"/>
- </groupbox>
- </tabpanel>
-
-
- <tabpanel>
- <groupbox flex="1">
    <grid style="overflow:auto; height:300px">
    <columns> <column/> <column width="150"/> <column/> </columns>
    <rows id="key_rows"/>
diff --git a/content/folders.js b/content/folders.js
index 8569a9e..4b51583 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -6,10 +6,7 @@ var nostalgy_completion_options = {
   match_case_sensitive : false,
   tab_shell_completion : false,
   always_include_tags  : false,
-  use_statistical_prediction: false,
-
-  /* not related to completion: should move to somewhere else */
-  always_show_search_mode : false
+  use_statistical_prediction: false
 };
 
 
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 915eff9..9f7e2fe 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -318,23 +318,12 @@ function onNostalgyLoad() {
    onSearchInputFocus = function(ev) {
      old_f1(ev);
      NostalgyEnterSearch();
-     if (nostalgy_completion_options.always_show_search_mode) NostalgyShowSearchMode();
    };
    var old_f2 = onSearchInputBlur;
    onSearchInputBlur = function(ev) {
      old_f2(ev);
      NostalgyLeaveSearch();
    };
-
-   var search = NostalgyQuickSearch();
-   if (search)
-       search.addEventListener
-	 ("popuphiding",
-	  function() {
-	   if (nostalgy_completion_options.always_show_search_mode &&
-	       nostalgy_search_focused) setTimeout(NostalgyShowSearchMode,0);
-	 },
-	  false);
  }
 }
 
@@ -1086,8 +1075,7 @@ function onNostalgyKeyDown(ev) {
 function onNostalgyKeyUp(ev) {
     if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
          ev.keyCode == KeyEvent.DOM_VK_CONTROL)
-        && nostalgy_search_focused
-        && !nostalgy_completion_options.always_show_search_mode) {
+        && nostalgy_search_focused) {
         var o = NostalgyQuickSearch();
         o.hidePopup();
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git