Commit 692d727b authored by Stanca Serban's avatar Stanca Serban
Browse files

Backed out changeset 50c9a0bea4c6 (bug 1418462) for causing mochitests... 

Backed out changeset 50c9a0bea4c6 (bug 1418462) for causing mochitests failures in browser_middleClick.js. CLOSED TREE
parent 5df03991

browser/app/profile/firefox.js

+0 −7
Original line number Diff line number Diff line
@@ -831,13 +831,6 @@ pref("security.allow_parent_unrestricted_js_loads", false); 
// this value (in milliseconds).

pref("browser.tabs.min_inactive_duration_before_unload", 600000);



// Does middleclick paste of clipboard to new tab button

#ifdef UNIX_BUT_NOT_MAC

pref("browser.tabs.searchclipboardfor.middleclick", true);

#else

pref("browser.tabs.searchclipboardfor.middleclick", false);

#endif



#if defined(XP_MACOSX)

  // During low memory periods, poll with this frequency (milliseconds)

  // until memory is no longer low. Changes to the pref take effect immediately.

browser/base/content/browser.js

+5 −26
Original line number Diff line number Diff line
@@ -556,13 +556,6 @@ XPCOMUtils.defineLazyPreferenceGetter( 
  true

);



XPCOMUtils.defineLazyPreferenceGetter(

  this,

  "gMiddleClickNewTabUsesPasteboard",

  "browser.tabs.searchclipboardfor.middleclick",

  true

);



XPCOMUtils.defineLazyPreferenceGetter(

  this,

  "gScreenshotsDisabled",
@@ -2860,11 +2853,7 @@ function openLocation(event) { 
  );

}



function BrowserOpenTab({ event, url } = {}) {

  let werePassedURL = !!url;

  url ??= BROWSER_NEW_TAB_URL;

  let searchClipboard = gMiddleClickNewTabUsesPasteboard && event?.button == 1;



function BrowserOpenTab({ event, url = BROWSER_NEW_TAB_URL } = {}) {

  let relatedToCurrent = false;

  let where = "tab";
@@ -2897,20 +2886,10 @@ function BrowserOpenTab({ event, url } = {}) { 
  Services.obs.notifyObservers(

    {

      wrappedJSObject: new Promise(resolve => {

        if (!werePassedURL && searchClipboard) {

          let clipboard = readFromClipboard();

          clipboard = UrlbarUtils.stripUnsafeProtocolOnPaste(clipboard);

          openTrustedLinkIn(clipboard, where, {

            relatedToCurrent,

            resolveOnNewTabCreated: resolve,

            allowThirdPartyFixup: true,

          });

        } else {

        openTrustedLinkIn(url, where, {

          relatedToCurrent,

          resolveOnNewTabCreated: resolve,

        });

        }

      }),

    },

    "browser-open-newtab-start"

browser/base/content/navigator-toolbox.inc.xhtml

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
                <toolbarbutton id="tabs-newtab-button"

                               class="toolbarbutton-1"

                               command="cmd_newNavigatorTab"

                               onclick="gBrowser.handleNewTabMiddleClick(this, event);"

                               onclick="checkForMiddleClick(this, event);"

                               tooltip="dynamic-shortcut-tooltip"/>

                <spacer class="closing-tabs-spacer" style="width: 0;"/>

              </hbox>
@@ -81,7 +81,7 @@ 
                         class="toolbarbutton-1 chromeclass-toolbar-additional"

                         data-l10n-id="tabs-toolbar-new-tab"

                         command="cmd_newNavigatorTab"

                         onclick="gBrowser.handleNewTabMiddleClick(this, event);"

                         onclick="checkForMiddleClick(this, event);"

                         tooltip="dynamic-shortcut-tooltip"

                         ondrop="newTabButtonObserver.onDrop(event)"

                         ondragover="newTabButtonObserver.onDragOver(event)"

browser/base/content/tabbrowser.js

+0 −23
Original line number Diff line number Diff line
@@ -4371,29 +4371,6 @@ 
      }

    },



    /**

     * Handles opening a new tab with mouse middleclick.

     * @param node

     * @param event

     *        The click event

     */

    handleNewTabMiddleClick(node, event) {

      // We should be using the disabled property here instead of the attribute,

      // but some elements that this function is used with don't support it (e.g.

      // menuitem).

      if (node.getAttribute("disabled") == "true") {

        return;

      } // Do nothing



      if (event.button == 1) {

        BrowserOpenTab({ event });

        // Stop the propagation of the click event, to prevent the event from being

        // handled more than once.

        // E.g. see https://bugzilla.mozilla.org/show_bug.cgi?id=1657992#c4

        event.stopPropagation();

      }

    },



    /**

     * Finds the tab that we will blur to if we blur aTab.

     * @param   aTab

browser/base/content/test/tabs/browser.ini

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ support-files = 
  request-timeout.sjs

  wait-a-bit.sjs

[browser_long_data_url_label_truncation.js]

[browser_middle_click_new_tab_button_loads_clipboard.js]

[browser_multiselect_tabs_active_tab_selected_by_default.js]

[browser_multiselect_tabs_bookmark.js]

[browser_multiselect_tabs_clear_selection_when_tab_switch.js]