forked from ZenBrowserMirrors/zen-desktop
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
commit
2bd548fe41
10 changed files with 22 additions and 3 deletions
|
@ -5,6 +5,9 @@ on:
|
||||||
- cron: '59 4 * * 2'
|
- cron: '59 4 * * 2'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check_candidates:
|
check_candidates:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
3
.github/workflows/code-linter.yml
vendored
3
.github/workflows/code-linter.yml
vendored
|
@ -10,6 +10,9 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- dev
|
- dev
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
3
.github/workflows/issue-metrics.yml
vendored
3
.github/workflows/issue-metrics.yml
vendored
|
@ -1,4 +1,7 @@
|
||||||
name: Monthly issue metrics
|
name: Monthly issue metrics
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: read
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
|
|
2
.github/workflows/macos-release-build.yml
vendored
2
.github/workflows/macos-release-build.yml
vendored
|
@ -1,4 +1,6 @@
|
||||||
name: macOS Release Build
|
name: macOS Release Build
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
|
|
2
.github/workflows/pr-test.yml
vendored
2
.github/workflows/pr-test.yml
vendored
|
@ -1,4 +1,6 @@
|
||||||
name: Pull request test
|
name: Pull request test
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
3
.github/workflows/windows-profile-build.yml
vendored
3
.github/workflows/windows-profile-build.yml
vendored
|
@ -1,5 +1,8 @@
|
||||||
name: Windows PGO Builds
|
name: Windows PGO Builds
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
inputs:
|
inputs:
|
||||||
|
|
3
.github/workflows/windows-release-build.yml
vendored
3
.github/workflows/windows-release-build.yml
vendored
|
@ -1,5 +1,8 @@
|
||||||
name: Windows Release Build
|
name: Windows Release Build
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
inputs:
|
inputs:
|
||||||
|
|
|
@ -275,7 +275,7 @@ var gZenMarketplaceManager = {
|
||||||
const themeList = document.createElement('div');
|
const themeList = document.createElement('div');
|
||||||
|
|
||||||
for (const theme of Object.values(themes).sort((a, b) => a.name.localeCompare(b.name))) {
|
for (const theme of Object.values(themes).sort((a, b) => a.name.localeCompare(b.name))) {
|
||||||
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
|
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
|
||||||
const isThemeEnabled = theme.enabled === undefined || theme.enabled;
|
const isThemeEnabled = theme.enabled === undefined || theme.enabled;
|
||||||
const fragment = window.MozXULElement.parseXULToFragment(`
|
const fragment = window.MozXULElement.parseXULToFragment(`
|
||||||
<vbox class="zenThemeMarketplaceItem">
|
<vbox class="zenThemeMarketplaceItem">
|
||||||
|
|
|
@ -76,7 +76,7 @@ var ZenThemesCommon = {
|
||||||
|
|
||||||
for (let [entry, label] of Object.entries(preferences)) {
|
for (let [entry, label] of Object.entries(preferences)) {
|
||||||
const [_, negation = '', os = '', property] =
|
const [_, negation = '', os = '', property] =
|
||||||
/(!?)(?:(macos|windows|linux):)?([A-z0-9-_.]+)/g.exec(entry);
|
/(!?)(?:(macos|windows|linux):)?([A-Za-z0-9-_.]+)/g.exec(entry);
|
||||||
const isNegation = negation === '!';
|
const isNegation = negation === '!';
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|
|
@ -249,7 +249,7 @@ var gZenThemesImporter = new (class {
|
||||||
writeToDom(themesWithPreferences) {
|
writeToDom(themesWithPreferences) {
|
||||||
for (const browser of ZenMultiWindowFeature.browsers) {
|
for (const browser of ZenMultiWindowFeature.browsers) {
|
||||||
for (const { enabled, preferences, name } of themesWithPreferences) {
|
for (const { enabled, preferences, name } of themesWithPreferences) {
|
||||||
const sanitizedName = `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
|
const sanitizedName = `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
|
||||||
|
|
||||||
if (enabled !== undefined && !enabled) {
|
if (enabled !== undefined && !enabled) {
|
||||||
const element = browser.document.getElementById(sanitizedName);
|
const element = browser.document.getElementById(sanitizedName);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue