Bug 1518823 - Port bug 1482389: Disable assigning fake JS tree. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Tue, 15 Jan 2019 10:42:54 +0100
changeset 34204 561033e56bac3a4bf5724ba104d127835db5dfd6
parent 34203 96b12a150fe1d827b9be239705e6e94492d36c54
child 34205 0ecdef42a8cb64d6eb9bbeff0eda2c4e83794717
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersbustage-fix
bugs1518823, 1482389
Bug 1518823 - Port bug 1482389: Disable assigning fake JS tree. rs=bustage-fix
mail/base/content/folderDisplay.js
mail/base/content/messageWindow.js
--- a/mail/base/content/folderDisplay.js
+++ b/mail/base/content/folderDisplay.js
@@ -1768,18 +1768,18 @@ FolderDisplayWidget.prototype = {
     //  up-to-date even while hidden in the background
     if (aNullRealTreeBoxView && this.tree)
       this.tree.view = null;
     // (and tell the db view about its selection again...)
     this.view.dbView.selection = treeSelection;
 
     // hook the dbview up to the fake tree box
     this._fakeTree.view = this.view.dbView;
-    this.view.dbView.setTree(this._fakeTree);
-    treeSelection.tree = this._fakeTree;
+    // this.view.dbView.setTree(this._fakeTree);  // See bug 1518823.
+    // treeSelection.tree = this._fakeTree;
   },
 
   /**
    * @name Command Support
    */
   // @{
 
   /**
--- a/mail/base/content/messageWindow.js
+++ b/mail/base/content/messageWindow.js
@@ -97,17 +97,17 @@ StandaloneFolderDisplayWidget.prototype 
 
     // only if we're not dealing with a dummy message (from .eml file /
     //  attachment should we try and hook up the selection object.)  Otherwise
     //  the view will not operate in stand alone message mode.
     // XXX the sequencing here may break re-using a message window that is
     //  showing an .eml file to go to a real message, at least in terms of
     //  having the selection object properly associated with the tree.
     if (!this.messageDisplay.isDummy) {
-      this.view.dbView.setTree(this._fakeTree);
+      // this.view.dbView.setTree(this._fakeTree);  // See bug 1518823.
       this.view.dbView.selection = this._magicTreeSelection;
       // This lets the dbView know we don't really have a tree, so it can
       // avoid operating on messages in collapsed threads.
       this._magicTreeSelection.tree = null;
     }
     this.__proto__.__proto__.onCreatedView.call(this);
   },