Commit e2948093 authored by criss's avatar criss
Browse files

Backed out 2 changesets (bug 371900) for causing bug 1749182 . CLOSED TREE 

Backed out changeset e59035c65af3 (bug 371900)
Backed out changeset 6434bce9c7d4 (bug 371900)
parent 6e85ccca

browser/base/content/browser-development-helpers.js

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ var DevelopmentHelpers = { 
    let command = document.createXULElement("command");

    command.setAttribute("id", "cmd_quickRestart");

    command.addEventListener("command", this.quickRestart, true);

    command.setAttribute("oncommand", "void 0;"); // Needed - bug 371900

    document.getElementById("mainCommandSet").prepend(command);



    let key = document.createXULElement("key");
@@ -37,6 +38,7 @@ var DevelopmentHelpers = { 
    key.setAttribute("key", "r");

    key.setAttribute("modifiers", "accel,alt");

    key.setAttribute("command", "cmd_quickRestart");

    key.setAttribute("oncommand", "void 0;"); // Needed - bug 371900

    document.getElementById("mainKeyset").prepend(key);



    let menuitem = document.createXULElement("menuitem");

browser/base/content/browser-sets.inc

+12 −23
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ 
    <key id="key_toggleMute" data-l10n-id="mute-toggle-shortcut" command="cmd_toggleMute" modifiers="control"/>

    <key id="key_undo"

         data-l10n-id="text-action-undo-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_redo"

#ifdef XP_UNIX

         data-l10n-id="text-action-undo-shortcut"
@@ -180,21 +179,18 @@ 
         data-l10n-id="text-action-redo-shortcut"

         modifiers="accel"

#endif

         internal="true"/>

         />

    <key id="key_cut"

         data-l10n-id="text-action-cut-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_copy"

         data-l10n-id="text-action-copy-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_paste"

         data-l10n-id="text-action-paste-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_delete" keycode="VK_DELETE" command="cmd_delete" reserved="false"/>

    <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel" internal="true"/>

    <key id="key_selectAll" data-l10n-id="text-action-select-all-shortcut" modifiers="accel"/>



    <key keycode="VK_BACK" command="cmd_handleBackspace" reserved="false"/>

    <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift" reserved="false"/>
@@ -314,9 +310,7 @@ 
# On OS X, dark voodoo magic invokes the quit code for this key.

# So we're not adding the attribute on OSX because of backwards/add-on compat.

# See bug 1369909 for background on this.

#ifdef XP_MACOSX

         internal="true"

#else

#ifndef XP_MACOSX

         command="cmd_quitApplication"

#endif

         reserved="true"/>
@@ -367,25 +361,20 @@ 
    <key id="key_minimizeWindow"

         command="minimizeWindow"

         data-l10n-id="window-minimize-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_openHelpMac"

         oncommand="openHelpLink('firefox-osxkey');"

         data-l10n-id="help-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <!-- These are used to build the Application menu -->

    <key id="key_preferencesCmdMac"

         data-l10n-id="preferences-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_hideThisAppCmdMac"

         data-l10n-id="hide-app-shortcut"

         modifiers="accel"

         internal="true"/>

         modifiers="accel"/>

    <key id="key_hideOtherAppsCmdMac"

         data-l10n-id="hide-other-apps-shortcut"

         modifiers="accel,alt"

         internal="true"/>

         modifiers="accel,alt"/>

#endif

  </keyset>

browser/components/downloads/content/contentAreaDownloadsView.xhtml

+5 −1
Original line number Diff line number Diff line
@@ -15,11 +15,15 @@ 
%editMenuDTD;

]>



<!-- @CSP: We have to whitelist the 'oncommand' handler for all the cmd_* fields within

   - editMenuOverlay.js until Bug 371900 is fixed using

   -    sha512-4o5Uf4E4EG+90Mb820FH2YFDf4IuX4bfUwQC7reK1ZhgcXWJBKMK2330XIELaFJJ8HiPffS9mP60MPjuXMIrHA==

   -->

<window id="contentAreaDownloadsView"

        data-l10n-id="downloads-window"

        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

        xmlns:html="http://www.w3.org/1999/xhtml"

        csp="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'">

        csp="default-src chrome:; script-src chrome: 'sha512-4o5Uf4E4EG+90Mb820FH2YFDf4IuX4bfUwQC7reK1ZhgcXWJBKMK2330XIELaFJJ8HiPffS9mP60MPjuXMIrHA=='; img-src chrome: moz-icon:; object-src 'none'">



  <linkset>

    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>

browser/components/preferences/preferences.js

+0 −4
Original line number Diff line number Diff line
@@ -238,10 +238,6 @@ function init_all() { 


  window.addEventListener("hashchange", onHashChange);



  document.getElementById("focusSearch1").addEventListener("command", () => {

    gSearchResultsPane.searchInput.focus();

  });



  gotoPref().then(() => {

    let helpButton = document.getElementById("helpButton");

    let helpUrl =

browser/components/preferences/preferences.xhtml

+8 −3
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ 
        id="preferences-root">



<head>

  <!-- @CSP: We should remove 'unsafe-inline' from style-src, see Bug 1579160 -->

  <meta http-equiv="Content-Security-Policy" content="default-src chrome:; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />

  <!-- @CSP: The 'oncommand' handler for 'focusSearch1' can not easily be rewritten (see Bug 371900)

       hence we are allowing the inline handler in the script-src directive using the hash

       sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ==

       Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->

  <meta http-equiv="Content-Security-Policy" content="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />



  <title data-l10n-id="settings-page-title"></title>
@@ -179,7 +182,9 @@ 
    </vbox>



    <keyset>

      <key data-l10n-id="focus-search" key="" modifiers="accel" id="focusSearch1"/>

      <!-- If you change the code within the oncommand handler of 'focusSearch1' you have to update the current hash of

           sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ== within the CSP above. -->

      <key data-l10n-id="focus-search" key="" modifiers="accel" id="focusSearch1" oncommand="gSearchResultsPane.searchInput.focus();"/>

    </keyset>



    <vbox class="main-content" flex="1" align="start">