Merge from mozilla-central to mozilla-inbound

This commit is contained in:
Matt Brubeck 2011-09-26 10:44:16 -07:00
commit 65706f0f22
2 changed files with 4 additions and 1 deletions

View File

@ -261,6 +261,8 @@ var PageActions = {
let container = document.getElementById("pageactions-container");
let visibleNodes = container.querySelectorAll("pageaction:not([hidden=true])");
let visibleCount = visibleNodes.length;
if (visibleCount == 0)
return;
for (let i = 0; i < visibleCount; i++)
visibleNodes[i].classList.remove("odd-last-child");

View File

@ -6,13 +6,14 @@ let gCurrentTab = null;
function test() {
waitForExplicitFinish();
gCurrentTab = Browser.addTab(testURL_01, true);
messageManager.addMessageListener("pageshow", function() {
if (gCurrentTab.browser.currentURI.spec == testURL_01) {
messageManager.removeMessageListener("pageshow", arguments.callee);
pageLoaded();
}
});
gCurrentTab = Browser.addTab(testURL_01, true);
}
function pageLoaded() {