Skip to content

Commit 2bd548f

Browse files
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents 367ad74 + d9d3076 commit 2bd548f

File tree

10 files changed

+22
-3
lines changed

10 files changed

+22
-3
lines changed

.github/workflows/check-candidate-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '59 4 * * 2'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
check_candidates:
1013
runs-on: ubuntu-latest

.github/workflows/code-linter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
branches:
1111
- dev
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
lint:
1518
runs-on: ubuntu-latest

.github/workflows/issue-metrics.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Monthly issue metrics
2+
permissions:
3+
contents: write
4+
issues: read
25
on:
36
workflow_dispatch:
47
schedule:

.github/workflows/macos-release-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: macOS Release Build
2+
permissions:
3+
contents: read
24

35
on:
46
workflow_call:

.github/workflows/pr-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Pull request test
2+
permissions:
3+
contents: read
24

35
on:
46
pull_request:

.github/workflows/windows-profile-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Windows PGO Builds
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_call:
58
inputs:

.github/workflows/windows-release-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Windows Release Build
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_call:
58
inputs:

src/browser/components/preferences/zen-settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ var gZenMarketplaceManager = {
275275
const themeList = document.createElement('div');
276276

277277
for (const theme of Object.values(themes).sort((a, b) => a.name.localeCompare(b.name))) {
278-
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
278+
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
279279
const isThemeEnabled = theme.enabled === undefined || theme.enabled;
280280
const fragment = window.MozXULElement.parseXULToFragment(`
281281
<vbox class="zenThemeMarketplaceItem">

src/zen/mods/ZenThemesCommon.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var ZenThemesCommon = {
7676

7777
for (let [entry, label] of Object.entries(preferences)) {
7878
const [_, negation = '', os = '', property] =
79-
/(!?)(?:(macos|windows|linux):)?([A-z0-9-_.]+)/g.exec(entry);
79+
/(!?)(?:(macos|windows|linux):)?([A-Za-z0-9-_.]+)/g.exec(entry);
8080
const isNegation = negation === '!';
8181

8282
if (

src/zen/mods/ZenThemesImporter.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ var gZenThemesImporter = new (class {
249249
writeToDom(themesWithPreferences) {
250250
for (const browser of ZenMultiWindowFeature.browsers) {
251251
for (const { enabled, preferences, name } of themesWithPreferences) {
252-
const sanitizedName = `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
252+
const sanitizedName = `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
253253

254254
if (enabled !== undefined && !enabled) {
255255
const element = browser.document.getElementById(sanitizedName);

0 commit comments

Comments
 (0)