Commit 49cb992e authored by Tim Nguyen's avatar Tim Nguyen
Browse files

Bug 1581670 - Remove XUL grid from browser/components/preferences/connection.xul. r=jaws 

Differential Revision: https://phabricator.services.mozilla.com/D46089

--HG--
extra : moz-landing-system : lando
parent 822add06

browser/components/preferences/connection.js

+5 −5
Original line number Diff line number Diff line
@@ -469,8 +469,8 @@ var gConnectionsDialog = { 
      return;

    }

    let [menu, customInput] = this.getDnsOverHttpsControls();

    let customContainer = document.getElementById(

      "customDnsOverHttpsContainer"

    let dohUIContainer = document.getElementById(

      "dnsOverHttps-grid"

    );

    let customURI = Preferences.get("network.trr.custom_uri").value;

    let currentURI = Preferences.get("network.trr.uri").value;
@@ -494,11 +494,11 @@ var gConnectionsDialog = { 
    }



    if (!menu.disabled && isCustom) {

      customContainer.hidden = false;

      dohUIContainer.classList.remove("custom-container-hidden");

      customInput.disabled = false;

      customContainer.scrollIntoView();

      customInput.scrollIntoView();

    } else {

      customContainer.hidden = true;

      dohUIContainer.classList.add("custom-container-hidden");

      customInput.disabled = true;

    }

browser/components/preferences/connection.xul

+82 −96
Original line number Diff line number Diff line
@@ -25,6 +25,20 @@ 
    <html:link rel="localization" href="branding/brand.ftl"/>

  </linkset>



  <html:style>

    #proxy-grid,

    #dnsOverHttps-grid {

      display: grid;

      grid-template-columns: auto 1fr;

      align-items: center;

    }



    #dnsOverHttps-grid.custom-container-hidden #networkCustomDnsOverHttpsInputLabelContainer,

    #dnsOverHttps-grid.custom-container-hidden #networkCustomDnsOverHttpsInput {

      display: none;

    }

  </html:style>



  <script src="chrome://browser/content/utilityOverlay.js"/>

  <script src="chrome://global/content/preferencesBindings.js"/>

  <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
@@ -51,13 +65,7 @@ 
      <radio value="4" data-l10n-id="connection-proxy-option-auto" />

      <radio value="5" data-l10n-id="connection-proxy-option-system" id="systemPref" hidden="true" />

      <radio value="1" data-l10n-id="connection-proxy-option-manual"/>

      <grid class="indent" flex="1">

        <columns>

          <column/>

          <column flex="1"/>

        </columns>

        <rows>

          <row align="center">

      <box id="proxy-grid" class="indent" flex="1">

        <hbox pack="end">

          <label data-l10n-id="connection-proxy-http" control="networkProxyHTTP" />

        </hbox>
@@ -68,15 +76,11 @@ 
          <html:input id="networkProxyHTTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535"

                      preference="network.proxy.http_port"/>

        </hbox>

          </row>

          <row>

        <hbox/>

        <hbox>

          <checkbox id="shareAllProxies" data-l10n-id="connection-proxy-http-share"

                    preference="network.proxy.share_proxy_settings"/>

        </hbox>

          </row>

          <row align="center">

        <hbox pack="end">

          <label data-l10n-id="connection-proxy-ssl" control="networkProxySSL"/>

        </hbox>
@@ -86,8 +90,6 @@ 
          <html:input id="networkProxySSL_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"

                      preference="network.proxy.ssl_port"/>

        </hbox>

          </row>

          <row align="center">

        <hbox pack="end">

          <label data-l10n-id="connection-proxy-ftp" control="networkProxyFTP"/>

        </hbox>
@@ -97,8 +99,6 @@ 
          <html:input id="networkProxyFTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"

                      preference="network.proxy.ftp_port"/>

        </hbox>

          </row>

          <row align="center">

        <hbox pack="end">

          <label data-l10n-id="connection-proxy-socks" control="networkProxySOCKS"/>

        </hbox>
@@ -108,8 +108,6 @@ 
          <html:input id="networkProxySOCKS_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"

                      preference="network.proxy.socks_port"/>

        </hbox>

          </row>

          <row>

        <spacer/>

        <box pack="start">

        <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
@@ -118,9 +116,7 @@ 
          <radio id="networkProxySOCKSVersion5" value="5" data-l10n-id="connection-proxy-socks5" />

        </radiogroup>

        </box>

          </row>

        </rows>

      </grid>

      </box>

      <radio value="2" data-l10n-id="connection-proxy-autotype" />

      <hbox class="indent" flex="1" align="center">

        <html:input id="networkProxyAutoconfigURL" type="text" style="-moz-box-flex: 1;" preference="network.proxy.autoconfig_url"
@@ -150,13 +146,7 @@ 
            data-l10n-id="connection-dns-over-https"

            preference="network.trr.mode"/>



    <grid class="indent" flex="1">

      <columns>

        <column></column>

        <column flex="1"></column>

      </columns>

      <rows>

        <row align="center">

    <box id="dnsOverHttps-grid" class="indent custom-container-hidden" flex="1">

      <hbox pack="end">

        <label id="networkDnsOverHttpsResolverChoicesLabel"

               data-l10n-id="connection-dns-over-https-url-resolver"
@@ -164,17 +154,13 @@ 
      </hbox>

      <menulist id="networkDnsOverHttpsResolverChoices"

                oncommand="gConnectionsDialog.updateDnsOverHttpsUI()"></menulist>

        </row>

        <row align="center" id="customDnsOverHttpsContainer" hidden="true">

          <hbox pack="end">

      <hbox pack="end" id="networkCustomDnsOverHttpsInputLabelContainer">

        <label id="networkCustomDnsOverHttpsInputLabel"

               data-l10n-id="connection-dns-over-https-custom-label"

               control="networkCustomDnsOverHttpsInput"/>

      </hbox>

      <html:input id="networkCustomDnsOverHttpsInput" type="text" style="-moz-box-flex: 1;"

                  preference="network.trr.custom_uri"/>

        </row>

      </rows>

    </grid>

    </box>

  </groupbox>

</dialog>

browser/components/preferences/in-content/tests/browser_extension_controlled.js

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ add_task(async function testExtensionControlledProxyConfig() { 
      }

      function getProxyControls() {

        let controlGroup = doc.getElementById("networkProxyType");

        let manualControlContainer = controlGroup.querySelector("grid");

        let manualControlContainer = controlGroup.querySelector("#proxy-grid");

        return {

          manualControls: [

            ...manualControlContainer.querySelectorAll(