Skip to content

[stable25] Refactor vuex store #3439

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
mejo- merged 4 commits into from
Nov 16, 2022
Merged

[stable25] Refactor vuex store #3439

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3362f3
Use vuex mapper functions to access the store
mejo- Nov 8, 2022
9c78a95
Move vuex store to a namespaced vuex store module
mejo- Nov 14, 2022
bcf80aa
Either set vuex store or register text module in store mixin
mejo- Nov 14, 2022
e0f09d1
Compile assets
nextcloud-command Nov 15, 2022
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
Prev Previous commit
Next Next commit
Either set vuex store or register text module in store mixin 
When a component from the NPM package is used by a vue app with an own
vuex store, we have to expand this store with our text module.

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo- @backportbot-nextcloud
mejo- authored and backportbot-nextcloud[bot] committed Nov 16, 2022
commit bcf80aa2883f1427fe9244d10ac214c2484a11d8
6 changes: 5 additions & 1 deletion src/mixins/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

import store from '../store/index.js'
import store, { textModule } from '../store/index.js'

/**
* This mixin is required since we cannot be sure that the root Vue instance has
Expand All @@ -35,7 +35,11 @@ export default {
},
beforeMount() {
if (typeof this.$store === 'undefined') {
// Store is undefined, e.g. when used through `viewer.js`
this.$store = store
} else if (!this.$store.hasModule('text')) {
// Store lacks text modul (another store exists), e.g. when used as component via NPM package
this.$store.registerModule('text', textModule)
}
},
}
2 changes: 1 addition & 1 deletion src/store/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const persistentStorage = getBuilder('text').persist().build()

Vue.use(Vuex)

const textModule = {
export const textModule = {
state: {
showAuthorAnnotations: persistentStorage.getItem('showAuthorAnnotations') === 'true',
currentSession: persistentStorage.getItem('currentSession'),
Expand Down