Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 373944 - revert the workarounds for bug #373719, bug #373721, bug #374150 and bug #374166 caused by bug #267833. patch by seth and me, r=dietrich. a=blocking-m9.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@238126 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com 2007-10-25 02:37:05 +00:00
parent 9ab84a82ef
commit d896e69c43
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/browser/components/places/content/moveBookmarks.js
View File

@ -52,12 +52,9 @@ var gMoveBookmarksDialog = {
this._nodes = window.arguments[0];
this._tm = window.arguments[1];
// setTimeout until bug 373944 is fixed
setTimeout(function(aSelf) {
// select and expand the root node
aSelf.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
aSelf.foldersTree.selectedNode.containerOpen = true;
}, 0, this);
// select and expand the root node
this.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
this.foldersTree.selectedNode.containerOpen = true;
},
onOK: function MBD_onOK(aEvent) {

7
mozilla/browser/components/places/content/places.js
View File

@ -54,13 +54,6 @@ var PlacesOrganizer = {
_content: null,
init: function PO_init() {
var self = this;
// on timeout because of the corresponding setTimeout()
// in the places tree binding's constructor
setTimeout(function() { self._init(); }, 0);
},
_init: function PO__init() {
this._places = document.getElementById("placesList");
this._content = document.getElementById("placeContent");

14
mozilla/browser/components/places/content/tree.xml
View File

@ -49,14 +49,9 @@
this._controller = new PlacesController(this);
this.controllers.appendController(this._controller);
// Force an initial build.
// but do it on setTimeout() for bugs #373719 and bug #373721
// caused by a change for bug #267833
// note the corresponding setTimeout() in PO_init()
if (this.place) {
var self = this;
setTimeout(function() { self.place = self.place; }, 0);
}
// Force an initial build.
if (this.place)
this.place = this.place;
]]></constructor>
<destructor><![CDATA[
@ -156,7 +151,8 @@
if (this.showRoot != val) {
this.setAttribute("showRoot", val);
// reload with the last place set
this.place = this.place;
if (this.place)
this.place = this.place;
}
return val;
]]></setter>