[Pkg-mozext-commits] [nostalgy] 140/252: Fix for latest nighlty build.

[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 321a7f78aebb6163dc8b2fb3bf1f403b1871b243
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Sat Nov 15 23:05:01 2008 +0000

    Fix for latest nighlty build.
---
 content/nostalgy.js | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/content/nostalgy.js b/content/nostalgy.js
index 2d4e565..c6aa894 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -616,28 +616,43 @@ function NostalgyShowFolder(folder) {
     return true;
   }
 
-  var folderTree = GetFolderTree();
+  var folderTree = document.getElementById("folderTree");
   var totry = 1;
   var savedFolderView;
   if (window.CycleFolderView) {
-    totry = kNumFolderViews;
-    savedFolderView = gCurrentFolderView;
+      totry = kNumFolderViews;
+      savedFolderView = gCurrentFolderView;
+  } else if (window.gFolderTreeView) {
+      totry = window.gFolderTreeView.modeNames.length;
+      savedFolderView = window.gFolderTreeView.modeNames.indexOf(window.gFolderTreeView.mode);
   }
   var search = "";
   var input = GetSearchInput();
   if (input && !input.showingSearchCriteria) search = input.value;
-  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);
-      totry = 0;
-    } catch (ex) { totry--; CycleFolderView(true); }
+  if (window.gFolderTreeView) {
+      var saved_mode = window.gFolderTreeView.mode;
+      while (totry > 0) {
+          try {
+              window.gFolderTreeView.selectFolder(folder);
+              totry = 0;
+          } catch (ex) { totry--; window.gFolderTreeView.cycleMode(true); }
+      }
+      window.gFolderTreeView.mode = saved_mode;
+  } else {
+      while (totry > 0) {
+          try {
+              var idx = NostalgyEnsureFolderIndex(folderTree.builderView, folder);
+              ChangeSelection(folderTree, idx);
+              totry = 0;
+          } catch (ex) { totry--; CycleFolderView(true); }
+      }
+      if (window.CycleFolderView) { loadFolderView(savedFolderView); }
   }
-  if (window.CycleFolderView) { loadFolderView(savedFolderView); }
+  setTimeout(function() {
+          SetFocusThreadPane();
+          var s = GetThreadTree().view.selection;
+          if (s.count == 0) { s.select(s.currentIndex); }
+      }, 400);
   if (search != "") {
     input.focus();
     input.value = search;
@@ -917,7 +932,7 @@ function onNostalgyKeyPress(ev) {
       NostalgyStopEvent(ev);
     } else
     if (!in_message_window && ev.charCode == 102) { // F
-      GetFolderTree().focus();
+      document.getElementById("folderTree").focus();
       NostalgyStopEvent(ev);
     } else
     if (!in_message_window && ev.charCode == 105) { // I

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