From ecb38ffbfc8d2fc93e8848fc4054d1fdac51e695 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Fri, 10 Oct 2003 22:20:20 +0000 Subject: [PATCH] Supplementary patch to bug 221503 to fix timeout issues r=pch sr=alecf git-svn-id: svn://10.0.0.236/trunk@147854 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xpfe/components/bookmarks/resources/bookmarksMenu.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js index a38dbc96bed..4b894536153 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js @@ -717,7 +717,9 @@ var BookmarksToolbar = resizeFunc: function(event) { - if (event && event.target != document) + if (!event) // timer callback case + BookmarksToolbarRDFObserver._overflowTimerInEffect = false; + else if (event.target != document) return; // only interested in chrome resizes var buttons = document.getElementById("bookmarks-ptf"); @@ -755,7 +757,6 @@ var BookmarksToolbar = } } } - BookmarksToolbarRDFObserver._overflowTimerInEffect = false; }, // Fill in tooltips for personal toolbar @@ -807,7 +808,7 @@ var BookmarksToolbarRDFObserver = if (this._overflowTimerInEffect) return; this._overflowTimerInEffect = true; - setTimeout(BookmarksToolbar.resizeFunc, 0); + setTimeout(BookmarksToolbar.resizeFunc, 0, null); }, _overflowTimerInEffect: false, @@ -818,6 +819,6 @@ var BookmarksToolbarRDFObserver = if (aSource.Value != "NC:PersonalToolbarFolder" || aProperty.Value == NC_NS+"LastModifiedDate") return; this._overflowTimerInEffect = true; - setTimeout(BookmarksToolbar.resizeFunc, 0); + setTimeout(BookmarksToolbar.resizeFunc, 0, null); } }