Verified Commit de3c68fe authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Bug 41736: Customize toolbar for base-browser. 

Bug 41736: Stop placing the NoScript button in the palette, and let it
go to the toolbar by default when shown.
parent 27b3a865

browser/components/extensions/parent/ext-browserAction.js

+1 −9
Original line number Diff line number Diff line
@@ -176,10 +176,6 @@ this.browserAction = class extends ExtensionAPIPersistent { 
  }



  build() {

    // The extension ID for NoScript (WebExtension)

    const isNoScript =

      this.extension.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}";



    let { extension } = this;

    let widgetId = makeWidgetId(extension.id);

    let widget = CustomizableUI.createWidget({
@@ -190,11 +186,7 @@ this.browserAction = class extends ExtensionAPIPersistent { 
      removable: true,

      label: this.action.getProperty(null, "title"),

      tooltiptext: this.action.getProperty(null, "title"),

      // Do not want to add the NoScript extension to the toolbar by default.

      // tor-browser#41736

      defaultArea: isNoScript

        ? null

        : browserAreas[this.action.getDefaultArea()],

      defaultArea: browserAreas[this.action.getDefaultArea()],

      showInPrivateBrowsing: extension.privateBrowsingAllowed,

      disallowSubView: true,