[Pkg-mozext-commits] [nostalgy] 93/235: *** 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 d1f65d4a983b43ec4f7868b9527aafd7bd843f54
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Tue May 29 16:26:27 2007 +0000

    *** empty log message ***
    
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@93 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 CHANGES                  |   23 +++++++++++++----------
 content/edit_prefs.js    |    8 ++++----
 content/nostalgy.js      |   16 ++++++++++------
 content/nostalgy_keys.js |    5 ++++-
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/CHANGES b/CHANGES
index 37d63d9..e732c67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,18 +1,21 @@
 Since 0.2.13
-  - a system to export/import Nostalgy's rules (through e-mails)
-  - bug fix: custom shortcuts should not be recognized when typing
-    in a text box (QuickSearch or Nostalgy's completion box)
-  - make it work with TB 3.0 (tested with 3.0a1pre)
+  - a system to export and import Nostalgy's rules (through e-mails)
   - when showing a folder, if no message is currently selected,
     select the last one
-  - custom shortcuts are now working in stand-alone message windows
+  - change the behavior of the QuickSearch box: 
+    * always show the popup menu to select/show the current search criterion
+    * UP/DOWN: change the criterion (the view is automatically updated)
+    * RETURN (customizable): start the search, select the last result, 
+      focus thread pane
+    * CTRL-RETURN (customizable): same, but select all results
+    * ESCAPE: cancel search, focus thread pane
+
+  - make Nostalgy work with TB 3.0 (tested with 3.0a1pre)
   - Thunderbirds shortcuts that are hidden by Nostalgy can now
     be used (type "Escape" before)
-  - change the behavior of the QuickSearch box: always show the
-    popup menu to select/show the current search criterion; use UP/DOWN to
-    change the criterion (the view is automatically updated);
-    ESCAPE to focus the thread pane; Control+RETURN (customizable)
-    to start the search, select all results, and focus the thread pane
+  - bug fix: custom shortcuts are now working in stand-alone message windows
+  - bug fix: custom shortcuts with no modifier are not recognized when typing
+    in a text box (QuickSearch or Nostalgy's completion box)
 
 0.2.12
   - bug fix: use the mime-decoded version for the subject (for matching
diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index 0579ef6..33baaec 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -337,13 +337,13 @@ function onKeyPress(ev) {
     ev.stopPropagation();
     wait_key.value = wait_key_old;
     wait_key = null;
-  } else if (wait_key && (ev.keyCode != 13 || ev.ctrlKey || ev.altKey)) {
+  } else if (wait_key) /* && (ev.keyCode != 13 || ev.ctrlKey || ev.altKey)) */ {
     Recognize(ev,wait_key);
     wait_key = null;
-  } else if (ev.keyCode == KeyEvent.DOM_VK_RETURN) {
+  } /* else if (ev.keyCode == KeyEvent.DOM_VK_RETURN) {
     ev.preventDefault();
     ev.stopPropagation();
-  }
+    } */
 }
 
 
@@ -391,4 +391,4 @@ function SelectFolder() {
 }
 
 window.addEventListener("load", onNostalgyLoad, false);
-window.addEventListener("keypress", onKeyPress, false);
+window.addEventListener("keypress", onKeyPress, true);
diff --git a/content/nostalgy.js b/content/nostalgy.js
index fc0cd87..9ba2922 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -705,14 +705,15 @@ function NostalgySearchSender() {
   }
 }
 
-function NostalgySearchSelectAll() {
+function NostalgySearchSelectAll(select) {
   if (!gSearchInput || gSearchInput.value == "" 
       || gSearchInput.showingSearchCriteria) return;
 
   initializeSearchBar();
   nostalgy_on_search_done = function() {
     nostalgy_on_search_done = null;
-    gDBView.selection.selectAll();
+    if (select) gDBView.selection.selectAll();
+    else NostalgySelectLastMsg();
     SetFocusThreadPane();
   };
   onSearchInput(true);
@@ -792,15 +793,18 @@ function onNostalgyKeyPress(ev) {
     ev.preventDefault();
     return;
   }
-  if (kn == "ESCAPE" && nostalgy_search_focused) {
-    NostalgyFocusThreadPane();
+  if (ev.keyCode == KeyEvent.DOM_VK_ESCAPE && nostalgy_search_focused) {
+    Search(""); 
+    SetFocusThreadPane();
+    ev.stopPropagation();
     ev.preventDefault();
     return;
   }
-  if (ev.originalTarget.localName == "input" && !ev.ctrlKey && !ev.altKey) 
+  if (ev.charCode && ev.originalTarget.localName == "input" 
+      && !ev.ctrlKey && !ev.altKey) 
     return;
   var k = nostalgy_active_keys[kn];
-  if (k) { ParseCommand(k); ev.preventDefault();  ev.stopPropagation();}
+  if (k) { ParseCommand(k); ev.preventDefault(); ev.stopPropagation();}
 }
 
 function ParseCommand(k) {
diff --git a/content/nostalgy_keys.js b/content/nostalgy_keys.js
index f6da91a..e1d6886 100644
--- a/content/nostalgy_keys.js
+++ b/content/nostalgy_keys.js
@@ -17,7 +17,10 @@ var nostalgy_keys = [
    "JS:NostalgySearchSender();"],
   ["select_all","Search, select all messages and focus the thread pane",
    "control RETURN",
-   "JS:NostalgySearchSelectAll();"]
+   "JS:NostalgySearchSelectAll(true);"],
+  ["select_search","Search, select last result and focus the thread pane",
+   "RETURN",
+   "JS:NostalgySearchSelectAll(false);"]
 ];
 
 

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