Skip to content

Commit 8407219

Browse files
mr-cheffymr-cheffy
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents d786c69 + 2a01134 commit 8407219

24 files changed

+428
-704
lines changed

‎l10n‎

‎src/browser/app/profile/performance.inc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,3 @@ pref("browser.lowMemoryResponseMask", 3);
1616
#endif
1717

1818
pref("network.predictor.enable-hover-on-ssl", true);
19-
20-
// Experimental Zen Features
21-
// Strategy to use for bytecode cache (Thanks https://github.com/gunir)
22-
pref('dom.script_loader.bytecode_cache.strategy', 2);

‎src/browser/app/profile/smoothscroll.inc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// License, v. 2.0. If a copy of the MPL was not distributed with this
33
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

5-
pref("apz.overscroll.enabled", true);
6-
pref("general.smoothScroll", true);
7-
pref("general.smoothScroll.msdPhysics.enabled", true);
85
pref("general.smoothScroll.currentVelocityWeighting", "0.15");
96
pref("general.smoothScroll.stopDecelerationWeighting", "0.6");
107
pref("mousewheel.min_line_scroll_amount", 10);

‎src/browser/base/content/zen-assets.inc.xhtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@
5555
<script type="text/javascript" src="chrome://browser/content/zen-components/ZenGlanceManager.mjs"></script>
5656
<script type="text/javascript" src="chrome://browser/content/zen-components/ZenMediaController.mjs"></script>
5757
<script type="text/javascript" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
58+
<script type="text/javascript" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>

‎src/browser/base/content/zen-assets.jar.inc.mn‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
content/browser/zen-sets.js (../../zen/common/zen-sets.js)
99
content/browser/ZenUIManager.mjs (../../zen/common/ZenUIManager.mjs)
1010
content/browser/zen-components/ZenActorsManager.mjs (../../zen/common/ZenActorsManager.mjs)
11-
content/browser/zen-components/ZenEmojis.mjs (../../zen/common/ZenEmojis.mjs)
1211
content/browser/ZenCustomizableUI.sys.mjs (../../zen/common/ZenCustomizableUI.sys.mjs)
1312
content/browser/zen-components/ZenUIMigration.mjs (../../zen/common/ZenUIMigration.mjs)
1413
content/browser/zen-components/ZenCommonUtils.mjs (../../zen/common/ZenCommonUtils.mjs)
1514
content/browser/zen-components/ZenSessionStore.mjs (../../zen/common/ZenSessionStore.mjs)
15+
content/browser/zen-components/ZenEmojisData.min.mjs (../../zen/common/emojis/ZenEmojisData.min.mjs)
16+
content/browser/zen-components/ZenEmojiPicker.mjs (../../zen/common/emojis/ZenEmojiPicker.mjs)
1617

1718
content/browser/zen-styles/zen-theme.css (../../zen/common/styles/zen-theme.css)
1819
content/browser/zen-styles/zen-buttons.css (../../zen/common/styles/zen-buttons.css)

‎src/browser/base/content/zen-keysets.inc.xhtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<command id="cmd_contextZenAddToEssentials" />
3737
<command id="cmd_contextZenRemoveFromEssentials" />
3838

39+
<command id="cmd_zenCtxDeleteWorkspace" />
40+
<command id="cmd_zenChangeWorkspaceName" />
41+
<command id="cmd_zenChangeWorkspaceIcon" />
42+
<command id="cmd_zenOpenWorkspacePanel" />
43+
3944
<command id="cmd_zenPinnedTabReset" />
4045
<command id="cmd_zenPinnedTabResetNoTab" />
4146

‎src/browser/base/content/zen-popupset.inc.xhtml‎

Lines changed: 17 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -74,50 +74,23 @@
7474
<html:div id="PanelUI-zen-workspaces-list">
7575
</html:div>
7676
</panelview>
77-
<panelview id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
78-
<vbox class="PanelUI-zen-workspaces-user-create">
79-
<h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
80-
<hbox class="PanelUI-zen-workspaces-creation-wraper">
81-
<hbox class="PanelUI-zen-workspaces-icons-container create"></hbox>
82-
<html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" />
83-
</hbox>
84-
</vbox>
85-
<html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
86-
<button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
87-
</button>
88-
<button id="PanelUI-zen-workspaces-create-cancel" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
89-
</button>
90-
</html:moz-button-group>
91-
</panelview>
92-
<panelview id="PanelUI-zen-workspaces-edit" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
93-
<vbox class="PanelUI-zen-workspaces-user-create">
94-
<h1 data-l10n-id="zen-panel-ui-workspaces-edit-text"></h1>
95-
<hbox class="PanelUI-zen-workspaces-creation-wraper">
96-
<hbox class="PanelUI-zen-workspaces-icons-container edit"></hbox>
97-
<html:input autofocus="true" id="PanelUI-zen-workspaces-edit-input" type="text" placeholder="Enter workspace name" />
98-
</hbox>
99-
</vbox>
100-
<html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-edit-footer">
101-
<button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-edit-save" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-save">
102-
</button>
103-
<button id="PanelUI-zen-workspaces-edit-cancel" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-cancel">
104-
</button>
105-
</html:moz-button-group>
106-
</panelview>
107-
<panelview id="PanelUI-zen-workspaces-icon-picker" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
108-
<vbox id="PanelUI-zen-workspaces-icon-picker-wrapper">
109-
<html:div id="PanelUI-zen-workspaces-icon-search-bar">
110-
<html:input autofocus="true" type="text" id="PanelUI-zen-workspaces-icon-search-input"/>
111-
</html:div>
112-
</vbox>
113-
</panelview>
11477
</panelmultiview>
11578
</panel>
11679

117-
<menupopup id="zenWorkspaceActionsMenu">
118-
<menuitem id="context_zenOpenWorkspace" data-l10n-id="zen-workspaces-panel-context-open"/>
119-
<menuseparator/>
120-
<menuitem id="context_zenEditWorkspace" data-l10n-id="zen-workspaces-panel-context-edit"/>
80+
<panel type="arrow" orient="vertical" id="PanelUI-zen-emojis-picker" position="bottomright topright" side="bottom">
81+
<hbox id="PanelUI-zen-emojis-picker-header">
82+
<html:input type="search" id="PanelUI-zen-emojis-picker-search" placeholder="Search emojis" />
83+
<toolbarbutton id="PanelUI-zen-emojis-picker-none" class="toolbarbutton-1" />
84+
</hbox>
85+
<hbox id="PanelUI-zen-emojis-picker-list" />
86+
</panel>
87+
88+
<menupopup id="zenWorkspaceMoreActions">
89+
<menuitem id="context_zenEditWorkspace" data-l10n-id="zen-workspaces-panel-change-name" command="cmd_zenChangeWorkspaceName"/>
90+
<menuitem id="context_zenEditWorkspaceIcon" data-l10n-id="zen-workspaces-panel-change-icon" command="cmd_zenChangeWorkspaceIcon"/>
91+
<menuitem class="zenToolbarThemePicker"
92+
data-l10n-id="zen-workspaces-change-gradient"
93+
command="cmd_zenOpenZenThemePicker"/>
12194
<menu id="context_zenWorkspacesOpenInContainerTab"
12295
data-l10n-id="zen-workspaces-panel-context-open-in-container-tab"
12396
selection-type="single"
@@ -127,5 +100,7 @@
127100
<menupopup />
128101
</menu>
129102
<menuseparator/>
130-
<menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete"/>
103+
<menuitem id="context_zenOpenWorkspacePanel" data-l10n-id="zen-workspaces-panel-context-manage" command="cmd_zenOpenWorkspacePanel"/>
104+
<menuseparator/>
105+
<menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete" command="cmd_zenCtxDeleteWorkspace"/>
131106
</menupopup>

‎src/browser/themes/shared/zen-icons/icons.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
.close-icon,
4040
#zen-sidebar-web-panel-close,
4141
#zen-glance-sidebar-close,
42+
#PanelUI-zen-emojis-picker-none,
4243
.zen-theme-picker-custom-list-item-remove {
4344
list-style-image: url('close.svg') !important;
4445
}
@@ -107,6 +108,7 @@
107108

108109
#PanelUI-menu-button,
109110
#appMenu-more-button2,
111+
.zen-workspaces-actions,
110112
#zen-workspace-actions-menu-icon {
111113
list-style-image: url('menu.svg') !important;
112114
}

‎src/dom/script/ScriptLoader-cpp.patch‎

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

‎src/zen/common/ZenEmojis.mjs‎

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

0 commit comments

Comments
 (0)