Skip to content

Commit e7ba138

Browse files
committed
Backed out changeset 5f5354d30a45 (bug 1783521) for causing bc failures on browser_ext_windows_create_url.js. CLOSED TREE
1 parent 177cbdd commit e7ba138

File tree

15 files changed

+0
-497
lines changed

15 files changed

+0
-497
lines changed

browser/app/profile/firefox.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -877,10 +877,6 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
877877
pref("browser.tabs.tooltipsShowPidAndActiveness", false);
878878
#endif
879879

880-
pref("browser.tabs.cardPreview.enabled", false);
881-
pref("browser.tabs.cardPreview.delayMs", 1000);
882-
pref("browser.tabs.cardPreview.showThumbnails", true);
883-
884880
pref("browser.tabs.firefox-view", true);
885881
pref("browser.tabs.firefox-view-next", true);
886882
pref("browser.tabs.firefox-view-newIcon", true);

browser/base/content/browser.xhtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
window.addEventListener("DOMContentLoaded",
138138
gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
139139
</script>
140-
<script type="module" src="chrome://browser/content/tabpreview/tabpreview.mjs"></script>
141140
</head>
142141
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
143142
# All sets except for popupsets (commands, keys, and stringbundles)

browser/base/content/main-popupset.inc.xhtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,6 @@
417417
<hbox id="ctrlTab-showAll-container" pack="center"/>
418418
</panel>
419419

420-
<html:tab-preview id="tabbrowser-tab-preview" hidden="true" />
421-
422420
<html:template id="pageActionPanelTemplate">
423421
<panel id="pageActionPanel"
424422
class="cui-widget-panel panel-no-padding"

browser/base/content/tabbrowser-tab.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,6 @@
531531
tabToWarm = gBrowser._findTabToBlurTo(this);
532532
}
533533
gBrowser.warmupTab(tabToWarm);
534-
535-
this.dispatchEvent(new CustomEvent("TabHoverStart", { bubbles: true }));
536534
}
537535

538536
_mouseleave() {
@@ -544,7 +542,6 @@
544542
this.linkedBrowser.unselectedTabHover(false);
545543
this.cancelUnselectedTabHoverTimer();
546544
}
547-
this.dispatchEvent(new CustomEvent("TabHoverEnd", { bubbles: true }));
548545
}
549546

550547
setSecondaryTabTooltipLabel(l10nID, l10nArgs) {

browser/base/content/tabbrowser-tabs.js

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
// This is loaded into all browser windows. Wrap in a block to prevent
1010
// leaking to window scope.
1111
{
12-
const TAB_PREVIEW_PREF = "browser.tabs.cardPreview.enabled";
13-
1412
class MozTabbrowserTabs extends MozElements.TabsBase {
1513
constructor() {
1614
super();
@@ -22,8 +20,6 @@
2220
this.addEventListener("TabShow", this);
2321
this.addEventListener("TabPinned", this);
2422
this.addEventListener("TabUnpinned", this);
25-
this.addEventListener("TabHoverStart", this);
26-
this.addEventListener("TabHoverEnd", this);
2723
this.addEventListener("transitionend", this);
2824
this.addEventListener("dblclick", this);
2925
this.addEventListener("click", this);
@@ -122,24 +118,6 @@
122118
if (gMultiProcessBrowser) {
123119
this.tabbox.tabpanels.setAttribute("async", "true");
124120
}
125-
126-
this.configureTooltip = () => {
127-
// fall back to original tooltip behavior if pref is not set
128-
this.tooltip = this._showCardPreviews ? null : "tabbrowser-tab-tooltip";
129-
130-
// activate new tooltip behavior if pref is set
131-
document
132-
.getElementById("tabbrowser-tab-preview")
133-
.toggleAttribute("hidden", !this._showCardPreviews);
134-
};
135-
XPCOMUtils.defineLazyPreferenceGetter(
136-
this,
137-
"_showCardPreviews",
138-
TAB_PREVIEW_PREF,
139-
false,
140-
() => this.configureTooltip()
141-
);
142-
this.configureTooltip();
143121
}
144122

145123
on_TabSelect(event) {
@@ -1813,22 +1791,6 @@
18131791

18141792
handleEvent(aEvent) {
18151793
switch (aEvent.type) {
1816-
case "TabHoverStart":
1817-
if (this._showCardPreviews) {
1818-
const previewContainer = document.getElementById(
1819-
"tabbrowser-tab-preview"
1820-
);
1821-
previewContainer.tab = aEvent.target;
1822-
}
1823-
break;
1824-
case "TabHoverEnd":
1825-
if (this._showCardPreviews) {
1826-
const previewContainer = document.getElementById(
1827-
"tabbrowser-tab-preview"
1828-
);
1829-
previewContainer.tab = null;
1830-
}
1831-
break;
18321794
case "mouseout":
18331795
// If the "related target" (the node to which the pointer went) is not
18341796
// a child of the current document, the mouse just left the window.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ skip-if =
202202
[browser_tab_manager_visibility.js]
203203
[browser_tab_move_to_new_window_reload.js]
204204
[browser_tab_play.js]
205-
[browser_tab_preview.js]
206205
[browser_tab_tooltips.js]
207206
[browser_tabswitch_contextmenu.js]
208207
[browser_tabswitch_select.js]

browser/base/content/test/tabs/browser_tab_preview.js

Lines changed: 0 additions & 126 deletions
This file was deleted.

browser/components/moz.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ DIRS += [
5656
"sessionstore",
5757
"shell",
5858
"syncedtabs",
59-
"tabpreview",
6059
"tabunloader",
6160
"textrecognition",
6261
"translations",

browser/components/preferences/main.inc.xhtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@
9696
preference="browser.taskbar.previews.enable"/>
9797
#endif
9898

99-
<checkbox id="tabPreviewShowThumbnails" data-l10n-id="settings-tabs-show-image-in-preview"
100-
preference="browser.tabs.cardPreview.showThumbnails" hidden="true"/>
101-
10299
<vbox id="browserContainersbox" hidden="true">
103100
<hbox id="browserContainersExtensionContent"
104101
align="center" class="extension-controlled info-box-container">

browser/components/preferences/main.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ Preferences.addAll([
8484
{ id: "browser.warnOnQuitShortcut", type: "bool" },
8585
{ id: "browser.tabs.warnOnOpen", type: "bool" },
8686
{ id: "browser.ctrlTab.sortByRecentlyUsed", type: "bool" },
87-
{ id: "browser.tabs.cardPreview.enabled", type: "bool" },
88-
{ id: "browser.tabs.cardPreview.showThumbnails", type: "bool" },
8987

9088
// CFR
9189
{
@@ -353,15 +351,6 @@ var gMainPane = {
353351
} catch (ex) {}
354352
}
355353

356-
let thumbsCheckbox = document.getElementById("tabPreviewShowThumbnails");
357-
let cardPreviewEnabledPref = Preferences.get(
358-
"browser.tabs.cardPreview.enabled"
359-
);
360-
let maybeShowThumbsCheckbox = () =>
361-
(thumbsCheckbox.hidden = !cardPreviewEnabledPref.value);
362-
cardPreviewEnabledPref.on("change", maybeShowThumbsCheckbox);
363-
maybeShowThumbsCheckbox();
364-
365354
// The "opening multiple tabs might slow down Firefox" warning provides
366355
// an option for not showing this warning again. When the user disables it,
367356
// we provide checkboxes to re-enable the warning.

browser/components/tabpreview/jar.mn

Lines changed: 0 additions & 7 deletions
This file was deleted.

browser/components/tabpreview/moz.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

browser/components/tabpreview/tabpreview.css

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)