[Pkg-mozext-commits] [nostalgy] 90/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 2f24d3bb9ca4f215832c2240edf2d08e4c3c639a
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Mon May 28 14:43:04 2007 +0000

    *** empty log message ***
---
 CHANGES             |  5 +++-
 content/nostalgy.js | 86 +++++++++++++++++++++++++++++++++++------------------
 files               |  1 +
 install.rdf         |  2 +-
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/CHANGES b/CHANGES
index f3de2a0..3c200dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,10 @@ 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 20070527)
+  - make it work with TB 3.0 (tested with 3.0a1pre)
+  - when showing a folder, if no message is currently selected,
+    select the last one
+  - custom shortcuts are now working in stand-alone message windows
 
 0.2.12
   - bug fix: use the mime-decoded version for the subject (for matching
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 0921a25..a42d14d 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -178,7 +178,23 @@ var NostalgyFolderListener = {
  OnItemBoolPropertyChanged: function(item, property, oldValue, newValue) { },
  OnItemUnicharPropertyChanged: function(item, property, oldValue, newValue){ },
  OnItemPropertyFlagChanged: function(item, property, oldFlag, newFlag) { },
- OnItemEvent: function(folder, event) { }
+ OnItemEvent: function(folder, event) { 
+   var evt = event.toString();
+   if (evt == "FolderLoaded") setTimeout(NostalgySelectLastMsg,50);
+   NostalgyDebug(event.toString()); 
+ }
+}
+
+function NostalgySelectMessageByNavigationType(type)
+{
+  var resultId = new Object;
+  var resultIndex = new Object;
+  var threadIndex = new Object;
+
+  gDBView.viewNavigate(type, resultId, resultIndex, threadIndex, true);
+
+  if ((resultId.value != nsMsgKey_None) && (resultIndex.value != nsMsgKey_None))
+    gDBView.selectMsgByKey(resultId.value);
 }
 
 function NostalgyMailSession() {
@@ -219,51 +235,62 @@ function onNostalgyLoad() {
  var nsIFolderListener = Components.interfaces.nsIFolderListener;
  if (mSession) 
    mSession.AddFolderListener(NostalgyFolderListener, 
-      nsIFolderListener.added | nsIFolderListener.removed);
+      nsIFolderListener.added | nsIFolderListener.removed | nsIFolderListener.event);
 
+ /*
  Components.classes["@mozilla.org/observer-service;1"].
    getService(Components.interfaces.nsIObserverService).
    addObserver(NostalgyObserver, "MsgMsgDisplayed", false);
+ */
+
+
+ var old_OnMsgParsed = OnMsgParsed;
+ OnMsgParsed = function (url) { old_OnMsgParsed(url); NostalgyOnMsgParsed(); };
+}
 
+function NostalgyOnMsgParsed() {
+  if (nostalgy_extracted_rules != "") {
+    var button = gEBI("nostalgy_extract_rules_buttons");
+    nostalgy_extracted_rules = "";
+    button.hidden = true;
+  }
+  
+  var doc = document.getElementById('messagepane').contentDocument;
+  var content = doc.body.textContent;
+  var b = "BEGIN RULES\n";
+  var i = content.indexOf(b);
+  if (i < 0) return;
+  i += b.length;
+  var j = content.indexOf("END RULES\n", i);
+  if (j < 0) return;
+  
+  nostalgy_extracted_rules = content.substr(i, j - i);
+  if (nostalgy_extracted_rules != "") {
+    var button = gEBI("nostalgy_extract_rules_buttons");
+    button.hidden = false;
+  }
 }
 
+/*
 var NostalgyObserver = {
   observe: function (subject, topic, state) {
     if (!state) return;
-
     subject = subject.QueryInterface(Components.interfaces.nsIMsgHeaderSink);
     if (subject != msgWindow.msgHeaderSink) return; // another window
-
-    if (nostalgy_extracted_rules != "") {
-      var button = gEBI("nostalgy_extract_rules_buttons");
-      nostalgy_extracted_rules = "";
-      button.hidden = true;
-    }
-    
-    var doc = document.getElementById('messagepane').contentDocument;
-    var content = doc.body.textContent;
-    var b = "BEGIN RULES\n";
-    var i = content.indexOf(b);
-    if (i < 0) return;
-    i += b.length;
-    var j = content.indexOf("END RULES\n", i);
-    if (j < 0) return;
-
-    nostalgy_extracted_rules = content.substr(i, j - i);
-    if (nostalgy_extracted_rules != "") {
-      var button = gEBI("nostalgy_extract_rules_buttons");
-      button.hidden = false;
-    }
+    NostalgyOnMsgParsed();
   }
 };
+*/
 
 function onNostalgyUnload() {
  var mSession = NostalgyMailSession();
  if (mSession) mSession.RemoveFolderListener(NostalgyFolderListener);
 
+ /*
  Components.classes["@mozilla.org/observer-service;1"].
    getService(Components.interfaces.nsIObserverService).
    removeObserver(NostalgyObserver, "MsgMsgDisplayed");
+ */
 }
 
 function NostalgyHideIfBlurred() {
@@ -298,7 +325,7 @@ function NostalgyDefLabel() {
 
 function NostalgyCollapseFolderPane() {
  var fp = gEBI("folderPaneBox");
- fp.collapsed = !fp.collapsed;
+ if (fp) fp.collapsed = !fp.collapsed;
 }
 
 
@@ -471,9 +498,9 @@ function NostalgyEnsureFolderIndex(builder, msgFolder)
 }
 
 function NostalgySelectLastMsg() {
-  if (gDBView) {
-     if (gDBView.numSelected == 0)
-       gDBView.selectMsgByKey(gDBView.getKeyAt(0));
+  if (!gDBView) return;
+  try { gDBView.viewIndexForFirstSelectedMsg; } catch (ex) {
+    NostalgySelectMessageByNavigationType(nsMsgNavigationType.lastMessage);
   }
 }
 
@@ -560,7 +587,7 @@ var NostalgyEscapePressed = 0;
 
 function NostalgyFocusThreadPane() {
   SetFocusThreadPane();
-  NostalgySelectLastMsg();
+  // NostalgySelectLastMsg();
 }
 
 function NostalgyEscape(ev) {
@@ -593,6 +620,7 @@ var last_cycle_restrict_value = null;
 var last_cycle_restrict = 0;
 
 function NostalgySearchSender() {
+  if (!window.GetSearchInput) return;
   var input = GetSearchInput();
   try {
   var recips = gDBView.msgFolder.displayRecipients;
diff --git a/files b/files
index 75c2411..f8af104 100644
--- a/files
+++ b/files
@@ -9,6 +9,7 @@ content/edit_rule.xul
 content/folders.js
 content/edit_rule.js
 content/composerOverlay.xul
+content/nostalgy_keys.js
 content/edit_prefs.js
 content/nostalgy.js
 locale/en-US/nostalgy.dtd
diff --git a/install.rdf b/install.rdf
index 853bb13..3405ad8 100644
--- a/install.rdf
+++ b/install.rdf
@@ -16,5 +16,5 @@
   <RDF:Description RDF:about="rdf:#$3Mz8c3"
                    em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
                    em:minVersion="1.5"
-                   em:maxVersion="3.0.0.*" />
+                   em:maxVersion="2.0.0.*" />
 </RDF:RDF>

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