From 00a184273425a63532d71240edc095afc1f30596 Mon Sep 17 00:00:00 2001 From: "dietrich%mozilla.com" Date: Wed, 16 Apr 2008 19:33:39 +0000 Subject: [PATCH] Bug 427746 - Bookmarks toolbar is empty when using 'copy' context menu option (for mak77@supereva.it, r=mano, a=beltzner) git-svn-id: svn://10.0.0.236/trunk@250319 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/components/places/content/toolbar.xml | 2 +- mozilla/toolkit/components/places/src/utils.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/browser/components/places/content/toolbar.xml b/mozilla/browser/components/places/content/toolbar.xml index 60797170c29..4867a39e75b 100755 --- a/mozilla/browser/components/places/content/toolbar.xml +++ b/mozilla/browser/components/places/content/toolbar.xml @@ -449,7 +449,7 @@ if (this._self._result != val) { this._self._containerNodesMap = []; this._self._result = val; - if (val) // this calls _rebuild through invalidateContainer + if (val) // this calls _rebuild through invalidateContainer val.root.containerOpen = true; } return val; diff --git a/mozilla/toolkit/components/places/src/utils.js b/mozilla/toolkit/components/places/src/utils.js index 19c723e01af..976c46842aa 100644 --- a/mozilla/toolkit/components/places/src/utils.js +++ b/mozilla/toolkit/components/places/src/utils.js @@ -1306,14 +1306,17 @@ var PlacesUtils = { // write child nodes if (!aNode.livemark) { asContainer(aSourceNode); - aSourceNode.containerOpen = true; + var wasOpen = aSourceNode.containerOpen; + if (!wasOpen) + aSourceNode.containerOpen = true; var cc = aSourceNode.childCount; for (var i = 0; i < cc; ++i) { if (i != 0) aStream.write(",", 1); serializeNodeToJSONStream(aSourceNode.getChild(i), i); } - aSourceNode.containerOpen = false; + if (!wasOpen) + aSourceNode.containerOpen = false; } // write suffix