mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 09:26:34 +00:00
Fixed git commits hashing
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
|
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
|
||||||
index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06de0061cf 100644
|
index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a2191a5f15dc 100644
|
||||||
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
|
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
|
||||||
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
|
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
|
||||||
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
||||||
@@ -19,8 +19,8 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
|
|
||||||
const kSpecialWidgetPfx = "customizableui-special-";
|
const kSpecialWidgetPfx = "customizableui-special-";
|
||||||
|
|
||||||
@@ -317,13 +318,11 @@ var CustomizableUIInternal = {
|
@@ -307,13 +308,11 @@ var CustomizableUIInternal = {
|
||||||
"vertical-spacer",
|
"spring",
|
||||||
"urlbar-container",
|
"urlbar-container",
|
||||||
"spring",
|
"spring",
|
||||||
- "save-to-pocket-button",
|
- "save-to-pocket-button",
|
||||||
@@ -35,7 +35,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
this.registerArea(
|
this.registerArea(
|
||||||
CustomizableUI.AREA_NAVBAR,
|
CustomizableUI.AREA_NAVBAR,
|
||||||
{
|
{
|
||||||
@@ -331,7 +330,6 @@ var CustomizableUIInternal = {
|
@@ -321,7 +320,6 @@ var CustomizableUIInternal = {
|
||||||
overflowable: true,
|
overflowable: true,
|
||||||
defaultPlacements: navbarPlacements,
|
defaultPlacements: navbarPlacements,
|
||||||
verticalTabsDefaultPlacements: [
|
verticalTabsDefaultPlacements: [
|
||||||
@@ -43,7 +43,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
"alltabs-button",
|
"alltabs-button",
|
||||||
],
|
],
|
||||||
defaultCollapsed: false,
|
defaultCollapsed: false,
|
||||||
@@ -356,10 +354,7 @@ var CustomizableUIInternal = {
|
@@ -346,10 +344,7 @@ var CustomizableUIInternal = {
|
||||||
{
|
{
|
||||||
type: CustomizableUI.TYPE_TOOLBAR,
|
type: CustomizableUI.TYPE_TOOLBAR,
|
||||||
defaultPlacements: [
|
defaultPlacements: [
|
||||||
@@ -54,7 +54,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
],
|
],
|
||||||
verticalTabsDefaultPlacements: [],
|
verticalTabsDefaultPlacements: [],
|
||||||
defaultCollapsed: null,
|
defaultCollapsed: null,
|
||||||
@@ -422,6 +417,7 @@ var CustomizableUIInternal = {
|
@@ -412,6 +407,7 @@ var CustomizableUIInternal = {
|
||||||
CustomizableUI.AREA_NAVBAR,
|
CustomizableUI.AREA_NAVBAR,
|
||||||
CustomizableUI.AREA_BOOKMARKS,
|
CustomizableUI.AREA_BOOKMARKS,
|
||||||
CustomizableUI.AREA_TABSTRIP,
|
CustomizableUI.AREA_TABSTRIP,
|
||||||
@@ -62,7 +62,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
]);
|
]);
|
||||||
if (AppConstants.platform != "macosx") {
|
if (AppConstants.platform != "macosx") {
|
||||||
toolbars.add(CustomizableUI.AREA_MENUBAR);
|
toolbars.add(CustomizableUI.AREA_MENUBAR);
|
||||||
@@ -1151,6 +1147,9 @@ var CustomizableUIInternal = {
|
@@ -1127,6 +1123,9 @@ var CustomizableUIInternal = {
|
||||||
placements = gPlacements.get(area);
|
placements = gPlacements.get(area);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
// For toolbars that need it, mark as dirty.
|
// For toolbars that need it, mark as dirty.
|
||||||
let defaultPlacements = areaProperties.get("defaultPlacements");
|
let defaultPlacements = areaProperties.get("defaultPlacements");
|
||||||
if (
|
if (
|
||||||
@@ -1564,7 +1563,7 @@ var CustomizableUIInternal = {
|
@@ -1540,7 +1539,7 @@ var CustomizableUIInternal = {
|
||||||
lazy.log.info(
|
lazy.log.info(
|
||||||
"Widget " + aWidgetId + " not found, unable to remove from " + aArea
|
"Widget " + aWidgetId + " not found, unable to remove from " + aArea
|
||||||
);
|
);
|
||||||
@@ -81,7 +81,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.notifyDOMChange(widgetNode, null, container, true, () => {
|
this.notifyDOMChange(widgetNode, null, container, true, () => {
|
||||||
@@ -1574,7 +1573,7 @@ var CustomizableUIInternal = {
|
@@ -1550,7 +1549,7 @@ var CustomizableUIInternal = {
|
||||||
// We also need to remove the panel context menu if it's there:
|
// We also need to remove the panel context menu if it's there:
|
||||||
this.ensureButtonContextMenu(widgetNode);
|
this.ensureButtonContextMenu(widgetNode);
|
||||||
if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
|
if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
|
||||||
@@ -90,7 +90,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
} else {
|
} else {
|
||||||
window.gNavToolbox.palette.appendChild(widgetNode);
|
window.gNavToolbox.palette.appendChild(widgetNode);
|
||||||
}
|
}
|
||||||
@@ -2678,7 +2677,6 @@ var CustomizableUIInternal = {
|
@@ -2654,7 +2653,6 @@ var CustomizableUIInternal = {
|
||||||
if (!this.isWidgetRemovable(aWidgetId)) {
|
if (!this.isWidgetRemovable(aWidgetId)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -98,7 +98,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
let placements = gPlacements.get(oldPlacement.area);
|
let placements = gPlacements.get(oldPlacement.area);
|
||||||
let position = placements.indexOf(aWidgetId);
|
let position = placements.indexOf(aWidgetId);
|
||||||
if (position != -1) {
|
if (position != -1) {
|
||||||
@@ -3669,7 +3667,7 @@ var CustomizableUIInternal = {
|
@@ -3609,7 +3607,7 @@ var CustomizableUIInternal = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
for (let [areaId, areaNodes] of gBuildAreas) {
|
for (let [areaId, areaNodes] of gBuildAreas) {
|
||||||
let placements = gPlacements.get(areaId);
|
let placements = gPlacements.get(areaId);
|
||||||
let isFirstChangedToolbar = true;
|
let isFirstChangedToolbar = true;
|
||||||
@@ -3680,7 +3678,7 @@ var CustomizableUIInternal = {
|
@@ -3620,7 +3618,7 @@ var CustomizableUIInternal = {
|
||||||
if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
|
if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
|
||||||
let defaultCollapsed = area.get("defaultCollapsed");
|
let defaultCollapsed = area.get("defaultCollapsed");
|
||||||
let win = areaNode.ownerGlobal;
|
let win = areaNode.ownerGlobal;
|
||||||
@@ -116,7 +116,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
win.setToolbarVisibility(
|
win.setToolbarVisibility(
|
||||||
areaNode,
|
areaNode,
|
||||||
typeof defaultCollapsed == "string"
|
typeof defaultCollapsed == "string"
|
||||||
@@ -4658,6 +4656,7 @@ export var CustomizableUI = {
|
@@ -4583,6 +4581,7 @@ export var CustomizableUI = {
|
||||||
unregisterArea(aName, aDestroyPlacements) {
|
unregisterArea(aName, aDestroyPlacements) {
|
||||||
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
|
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
|
||||||
},
|
},
|
||||||
@@ -124,7 +124,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
/**
|
/**
|
||||||
* Add a widget to an area.
|
* Add a widget to an area.
|
||||||
* If the area to which you try to add is not known to CustomizableUI,
|
* If the area to which you try to add is not known to CustomizableUI,
|
||||||
@@ -6483,11 +6482,11 @@ class OverflowableToolbar {
|
@@ -6408,11 +6407,11 @@ class OverflowableToolbar {
|
||||||
parseFloat(style.paddingLeft) -
|
parseFloat(style.paddingLeft) -
|
||||||
parseFloat(style.paddingRight) -
|
parseFloat(style.paddingRight) -
|
||||||
toolbarChildrenWidth;
|
toolbarChildrenWidth;
|
||||||
@@ -138,7 +138,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
});
|
});
|
||||||
|
|
||||||
lazy.log.debug(
|
lazy.log.debug(
|
||||||
@@ -6497,7 +6496,8 @@ class OverflowableToolbar {
|
@@ -6422,7 +6421,8 @@ class OverflowableToolbar {
|
||||||
// If the target has min-width: 0, their children might actually overflow
|
// If the target has min-width: 0, their children might actually overflow
|
||||||
// it, so check for both cases explicitly.
|
// it, so check for both cases explicitly.
|
||||||
let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
|
let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
|
||||||
@@ -148,7 +148,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
return { isOverflowing, targetContentWidth, totalAvailWidth };
|
return { isOverflowing, targetContentWidth, totalAvailWidth };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6591,7 +6591,7 @@ class OverflowableToolbar {
|
@@ -6516,7 +6516,7 @@ class OverflowableToolbar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!inserted) {
|
if (!inserted) {
|
||||||
@@ -157,7 +157,7 @@ index e6b9b7dcfab179e7552c146eb1551b45ad042266..8e2c8f73a647a6f62a557e4677b3dc06
|
|||||||
}
|
}
|
||||||
child.removeAttribute("cui-anchorid");
|
child.removeAttribute("cui-anchorid");
|
||||||
child.removeAttribute("overflowedItem");
|
child.removeAttribute("overflowedItem");
|
||||||
@@ -6753,6 +6753,9 @@ class OverflowableToolbar {
|
@@ -6678,6 +6678,9 @@ class OverflowableToolbar {
|
||||||
* @param {MouseEvent} aEvent the click event.
|
* @param {MouseEvent} aEvent the click event.
|
||||||
*/
|
*/
|
||||||
#onClickDefaultListButton(aEvent) {
|
#onClickDefaultListButton(aEvent) {
|
||||||
|
Reference in New Issue
Block a user