[Pkg-mozext-commits] [nostalgy] 94/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 38358019bb509b595377e5f8577356a3f50a8767
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Tue May 29 16:51:23 2007 +0000

    *** empty log message ***
    
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@94 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 CHANGES             |    1 +
 content/folders.js  |    4 ++++
 content/nostalgy.js |   19 +++++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index e732c67..6d63d55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Since 0.2.13
   - 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)
+  - bug fix: better detection of when Nostalgy's completion box loses focus
 
 0.2.12
   - bug fix: use the mime-decoded version for the subject (for matching
diff --git a/content/folders.js b/content/folders.js
index c973c33..29e4d11 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -226,6 +226,10 @@ function NostalgyFolderSelectionBox(box) {
  box.addSession(new NostalgyAutocomplete(box));
  box.processInput = NostalgyProcessInput;  
  box.processKeyPress = NostalgyProcessKeyPress; 
+ box.addEventListener("blur",function(){ 
+	setTimeout(function() { 
+	if (!box.getAttribute("focused")) box.undoAutoComplete();  
+	}, 100); },true);
 }
 
 function NostalgyFolderSelectionBoxes() {
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 9ba2922..feb0f2d 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -706,8 +706,13 @@ function NostalgySearchSender() {
 }
 
 function NostalgySearchSelectAll(select) {
+  if (!nostalgy_search_focused) return false;
+
   if (!gSearchInput || gSearchInput.value == "" 
-      || gSearchInput.showingSearchCriteria) return;
+      || gSearchInput.showingSearchCriteria) {
+    SetFocusThreadPane();
+    return true;
+  }
 
   initializeSearchBar();
   nostalgy_on_search_done = function() {
@@ -717,10 +722,10 @@ function NostalgySearchSelectAll(select) {
     SetFocusThreadPane();
   };
   onSearchInput(true);
+  return true;
 }
 
 function NostalgyEnterSearch() {
-  NostalgyDebug("Enter");
   var o = gEBI("quick-search-menupopup");
   if (!o) return;
   InitQuickSearchPopup();
@@ -729,7 +734,6 @@ function NostalgyEnterSearch() {
   nostalgy_search_focused = true;
 }
 function NostalgyLeaveSearch(ev) {
-  NostalgyDebug("Leave");
   nostalgy_search_focused = false;
   var o = gEBI("quick-search-menupopup");
   if (!o) return;
@@ -804,14 +808,13 @@ function onNostalgyKeyPress(ev) {
       && !ev.ctrlKey && !ev.altKey) 
     return;
   var k = nostalgy_active_keys[kn];
-  if (k) { ParseCommand(k); ev.preventDefault(); ev.stopPropagation();}
+  if (k) { if (ParseCommand(k)) { ev.preventDefault(); ev.stopPropagation();}}
 }
 
 function ParseCommand(k) {
-  if (k.indexOf("JS:") == 0) {
-    eval(k.substr(3,k.length - 3));
-    return;
-  }
+  if (k.indexOf("JS:") == 0)
+    return eval(k.substr(3,k.length - 3));
+
   var spl = k.match(/(.*) -> (.*)/);
   var folder = FindFolderExact(spl[2]);
   if (!folder) { alert("Cannot find folder " + spl[2]); return; }

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