[Pkg-mozext-commits] [nostalgy] 129/235: git-svn-id: http://nostalgy.googlecode.com/svn/trunk at 129 56b81dcf-5a2f-0410-9db0-014be2e416ff

[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 917960784fbd45bb41494ffe15e9491eb66178f1
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Sep 5 21:28:53 2007 +0000

    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@129 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 CHANGES                     |    7 +++++++
 content/composerOverlay.xul |    1 +
 content/nostalgy.js         |   28 +++++++++++++++++-----------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index b661d24..82f8322 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+0.2.15
+  - bug fix: the G command did not work when QuickSearch is not shown in 
+    the toolbar
+  - bug fix: in some situations, some keys were lost just after
+    the Nostalgy box was opened
+  - remove some harmless errors in the Error Console
+
 0.2.14
   - don't capture keys when another widget want them (e.g. a menu popup)
   - moving dev repository from CVS to SVN with public access
diff --git a/content/composerOverlay.xul b/content/composerOverlay.xul
index 23bb7f1..ec1bbd1 100644
--- a/content/composerOverlay.xul
+++ b/content/composerOverlay.xul
@@ -3,5 +3,6 @@
 <overlay id="nostalgy-compose-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+ <script src="misc.js"/>
  <script src="composer.js"/>
 </overlay>
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 636fa40..812afdf 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -293,13 +293,15 @@ function onNostalgyLoad() {
      NostalgyLeaveSearch();
    };
 
-   gEBI("quick-search-menupopup").addEventListener
-     ("popuphiding",
-      function() { 
-	if (nostalgy_completion_options.always_show_search_mode &&
-	    nostalgy_search_focused) setTimeout(NostalgyShowSearchMode,0);
-      },
-      false); 
+   var search = gEBI("quick-search-menupopup");
+   if (search)
+       search.addEventListener
+	 ("popuphiding",
+	  function() { 
+	   if (nostalgy_completion_options.always_show_search_mode &&
+	       nostalgy_search_focused) setTimeout(NostalgyShowSearchMode,0);
+	 },
+	  false); 
  }
 }
 
@@ -342,7 +344,7 @@ function onNostalgyUnload() {
  NostalgyRules.unregister();
 
  Components.classes["@mozilla.org/observer-service;1"].
-   getService(Components.interfaces.nsIObserverService)
+   getService(Components.interfaces.nsIObserverService).
    removeObserver(NostalgyObserver, "MsgMsgDisplayed");
 }
 
@@ -590,9 +592,9 @@ function NostalgyShowFolder(folder) {
     totry = kNumFolderViews;
     savedFolderView = gCurrentFolderView;
   }
+  var search = "";
   var input = GetSearchInput();
-  var search = input.value;
-  if (input.showingSearchCriteria) search = "";
+  if (input && !input.showingSearchCriteria) search = input.value;
   while (totry > 0) {
     try {
       var idx = NostalgyEnsureFolderIndex(folderTree.builderView, folder);
@@ -744,6 +746,7 @@ var last_cycle_saved_searchMode = 0;
 function NostalgySearchSender() {
   if (!window.GetSearchInput) return false;
   var input = GetSearchInput();
+  if (!input) { alert("Nostalgy error:\nCannot perform this action when Quick Search is not enabled"); return false; }
   try {
   var recips = gDBView.msgFolder.displayRecipients;
   var key = gDBView.hdrForFirstSelectedMessage.messageKey;
@@ -872,6 +875,8 @@ function onNostalgyKeyPressCapture(ev) {
 
 
 function onNostalgyKeyPress(ev) {
+  if (!nostalgy_statusBar.hidden) return;
+
   if (NostalgyEscapePressed >= 1) {
     if (!in_message_window && ev.charCode == 109) { // M
       NostalgyFocusMessagePane();
@@ -882,7 +887,8 @@ function onNostalgyKeyPress(ev) {
       NostalgyStopEvent(ev);
     } else
     if (!in_message_window && ev.charCode == 105) { // I
-      GetSearchInput().focus();
+      var search = GetSearchInput();
+      if (search) search.focus();
       NostalgyStopEvent(ev);
     }
     return;

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