Skip to content

Commit

Permalink
Revert "Merge pull request #1678 from hawkeye116477/current_CUI"
Browse files Browse the repository at this point in the history
This reverts commit a2d6e12, reversing
changes made to c386f49.
  • Loading branch information
Alex Kontos committed Aug 15, 2020
1 parent 1596b04 commit 1e9207f
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 308 deletions.
8 changes: 8 additions & 0 deletions browser/base/content/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -1761,6 +1761,14 @@ var gBrowserInit = {

BrowserWindowTracker.track(window);

gNavToolbox.palette = document.getElementById("BrowserToolbarPalette");
gNavToolbox.palette.remove();
let areas = CustomizableUI.areas;
areas.splice(areas.indexOf(CustomizableUI.AREA_FIXED_OVERFLOW_PANEL), 1);
for (let area of areas) {
let node = document.getElementById(area);
CustomizableUI.registerToolbarNode(node);
}
BrowserSearch.initPlaceHolder();

// Hack to ensure that the various initial pages favicon is loaded
Expand Down
Loading

3 comments on commit 1e9207f

@aeiouaeiouaeiouaeiouaeiouaeiou

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably causing #1715 and #1716.

@InvisibleManX
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have the same issue #1716 after updating, removing the Home Button and restarting the Current browser.

@InvisibleManX
Copy link

@InvisibleManX InvisibleManX commented on 1e9207f Aug 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently all this code and its consecutive reverting somehow managed to corrupt the file "xulstore.json" for some people.
That file's removal and staring a browser without it fixes everything and upon closing a new file is created, but it's not corrupted anymore.

More details are in this comment: #1715 (comment)

Please sign in to comment.