[Pkg-mozext-commits] [nostalgy] 61/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 fbf80a2731479eeb8c945a2033d444e0c965558e
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Mar 7 18:00:08 2007 +0000

    *** empty log message ***
---
 CHANGES             |  7 +++++--
 Makefile            |  6 +++---
 content/nostalgy.js | 24 ++++++++++++++++++++----
 files               |  9 +++------
 install.rdf         |  4 ++--
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4bbab7f..e14a3b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
-Since 0.2.1
+0.2.2
   - bug fix: field choices in rules were not saved correctly
   - allows to match fields with regexps in rules
-  - allow to switch to "Bcc:" in the composer
+  - allows to switch to "Bcc:" in the composer
+  - let the extension work with TB 2.0b2
+  - allows to jump to a folder even if it is not visible in the current
+    folder view
 
 0.2.1
   - fix for recent TB builds  (ontextcommand -> ontextentered,
diff --git a/Makefile b/Makefile
index 5f38f3e..33c466b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,6 @@ clean:
 
 
 install:
-	scp CHANGES clipper.ens.fr:www/info/CHANGES_NOSTALGY
-	scp content/about.xhtml clipper.ens.fr:www/info/ABOUT_NOSTALGY.html
-	scp nostalgy.xpi clipper.ens.fr:www/info/nostalgy-current.xpi
+	scp CHANGES frisch.fr:www/info/CHANGES_NOSTALGY
+	scp content/about.xhtml frisch.fr:www/info/ABOUT_NOSTALGY.html
+	scp nostalgy.xpi frisch.fr:www/info/nostalgy-current.xpi
diff --git a/content/nostalgy.js b/content/nostalgy.js
index fa2a9ca..4f547e2 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -317,6 +317,10 @@ function NostalgyEnsureFolderIndex(builder, msgFolder)
   var index = builder.getIndexOfResource(msgFolder);
   if (index == -1) {
     // if we couldn't find the folder, make all its ancestors visible
+
+    if (!msgFolder.parent) { throw 0; }  
+	// Folder not reachable in current view
+
     parent_idx = NostalgyEnsureFolderIndex(builder, msgFolder.parent);
     // maybe the folder is now visible
     index = builder.getIndexOfResource(msgFolder);
@@ -331,12 +335,24 @@ function NostalgyEnsureFolderIndex(builder, msgFolder)
 
 function ShowFolder(folder) {
   var folderTree = GetFolderTree();
-  var idx = NostalgyEnsureFolderIndex(folderTree.builderView, folder);
-  ChangeSelection(folderTree, idx);
-  setTimeout(function() { SetFocusThreadPane(); 
+  var totry = 1;
+  var savedFolderView;
+  if (window.CycleFolderView) { 
+    totry = kNumFolderViews;
+    savedFolderView = gCurrentFolderView;
+  }
+  while (totry > 0) {
+    try {
+      var idx = NostalgyEnsureFolderIndex(folderTree.builderView, folder);
+      ChangeSelection(folderTree, idx);
+      setTimeout(function() { SetFocusThreadPane(); 
         var s = GetThreadTree().view.selection;
 	if (s.count == 0) { s.select(s.currentIndex); }
-	}, 400);
+      }, 400);
+      totry = 0;
+    } catch (ex) { totry--; CycleFolderView(true); }
+  }
+  if (window.CycleFolderView) { loadFolderView(savedFolderView); }
 }
 
 function MoveToFolder(folder) {
diff --git a/files b/files
index c6ac9ae..d30c5b8 100644
--- a/files
+++ b/files
@@ -1,7 +1,7 @@
-content/.#nostalgy.js.1.3
-content/thunderbirdOverlay.xul
 content/about.xhtml
 content/about.xul
+content/composer.js
+content/composerOverlay.xul
 content/edit_prefs.js
 content/edit_prefs.xul
 content/edit_rule.js
@@ -9,10 +9,7 @@ content/edit_rule.xul
 content/folders.js
 content/messageOverlay.xul
 content/nostalgy.js
-content/.#nostalgy.js.1.15
-content/composer.js
-content/composerOverlay.xul
-content/.#composer.js.1.1
+content/thunderbirdOverlay.xul
 locale/en-US/nostalgy.dtd
 locale/en-US/nostalgy.properties
 defaults/preferences/nostalgy.js
diff --git a/install.rdf b/install.rdf
index d4a9857..addf6a3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="nostalgy at alain.frisch"
                    em:name="Nostalgy"
-                   em:version="0.2.1"
+                   em:version="0.2.2"
                    em:creator="Alain Frisch"
                    em:description="Adds shortcuts to change folder, move message, with folder completion"
                    em:homepageURL="http://www.eleves.ens.fr/home/frisch/soft_mozilla.html"
@@ -16,5 +16,5 @@
   <RDF:Description RDF:about="rdf:#$3Mz8c3"
                    em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
                    em:minVersion="1.5"
-                   em:maxVersion="2.0b1" />
+                   em:maxVersion="2.0b2" />
 </RDF:RDF>

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