Skip to content

Fix theming chaining #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Oct 6, 2020
Merged

Fix theming chaining #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix theming chaining
  • Loading branch information
@skjnldsv
skjnldsv committed Oct 5, 2020
commit 2ac8da0cd699bf5612dc9383f0b38879a0a68f7e
3 changes: 2 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module.exports = {
appVersion: true,
isTesting: true,
PLYR_ICONS: true,
oc_defaults: true,
},
extends: [
'@nextcloud',
],
};
}
4 changes: 2 additions & 2 deletions js/viewer-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ export default {
},

updateTitle(fileName) {
document.title = `${fileName} - ${OCA.Theming.name}`
document.title = `${fileName} - ${OCA.Theming?.name || oc_defaults.name}`
},

/**
Expand Down