[Pkg-mozext-commits] [nostalgy] 46/252: *** empty log message ***

[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 2a861132b84a1ddffe9c5d45d67b3d5399db3445
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Nov 8 12:11:26 2006 +0000

    *** empty log message ***
---
 CHANGES             |  1 +
 content/composer.js |  3 ---
 content/nostalgy.js | 26 ++++++++++----------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2bc1e3c..7f335a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ Since 0.1.9
   - allow to switch between "To:" and "Cc:" fields efficiently
   - bug fix: rules with non-empty folder condition don't match when 
     restricting to current server
+  - triple Escape to clear the quick search box
 
 0.1.9
   - allow installation on Thunderbird 2.0b1
diff --git a/content/composer.js b/content/composer.js
index 47c919a..0636fad 100644
--- a/content/composer.js
+++ b/content/composer.js
@@ -30,9 +30,6 @@ function onNostalgyLoad(){
   var tbox = gEBI("addressingWidget");
   nostalgy_old_awRecipientKeyPress = window.awRecipientKeyPress;
   window.awRecipientKeyPress = nostalgy_awRecipientKeyPress;
-  alert("UUUX");
-/*  window.addEventListener("keypress", onNostalgyKeyPress, true);
-  alert("T"); */
 }
 
 window.addEventListener("load", onNostalgyLoad, false);
diff --git a/content/nostalgy.js b/content/nostalgy.js
index de6d860..94877e4 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -321,27 +321,21 @@ function NostalgyScrollMsg(d) {
  }
 }
 
-function NostalgyEscape(ev) {
-  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusThreadPane()
-  else NostalgyLastEscapeTimeStamp = ev.timeStamp;
-}
 
-function NostalgySelectFolderPane(ev) {
-  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusFolderPane();
-}
+var NostalgyEscapePressed = 0;
 
-function NostalgySelectMessagePane(ev) {
-  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusMessagePane();
-}
-
-function NostalgySelectSearch(ev) {
-  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) {
-    GetSearchInput().focus();
-  }
+function NostalgyEscape(ev) {
+  NostalgyEscapePressed++;
+  var i = NostalgyEscapePressed;
+  setTimeout(
+    function(){ if (NostalgyEscapePressed==i) NostalgyEscapePressed = 0; },
+    300);
+  if (NostalgyEscapePressed == 3) onClearSearch();
+  if (NostalgyEscapePressed == 2) SetFocusThreadPane();
 }
 
 function onNostalgyKeyPress(ev) {
-  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) {
+  if (NostalgyEscapePressed >= 1) {
     if (ev.charCode == 109) { // M
       SetFocusMessagePane();
       ev.preventDefault();

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