moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whoops

This commit is contained in:
Henry Jameson 2018-11-26 04:44:54 +03:00
parent 2dbc5f757d
commit b948234aec
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/post_status_form/post_status_form.js
View File

@ -46,12 +46,10 @@ const PostStatusForm = {
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser) statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
} }
console.log(this.copyMessageScope)
const scope = (this.copyMessageScope && this.$store.state.config.copyScope || this.copyMessageScope === 'direct') const scope = (this.copyMessageScope && this.$store.state.config.copyScope || this.copyMessageScope === 'direct')
? this.copyMessageScope ? this.copyMessageScope
: this.$store.state.users.currentUser.default_scope : this.$store.state.users.currentUser.default_scope
console.log(this)
return { return {
dropFiles: [], dropFiles: [],
submitDisabled: false, submitDisabled: false,

2
src/main.js
View File

@ -43,7 +43,6 @@ const i18n = new VueI18n({
messages messages
}) })
=======
const persistedStateOptions = { const persistedStateOptions = {
paths: [ paths: [
'config', 'config',
@ -67,7 +66,6 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
plugins: [persistedState], plugins: [persistedState],
strict: false // Socket modifies itself, let's ignore this for now. strict: false // Socket modifies itself, let's ignore this for now.
// strict: process.env.NODE_ENV !== 'production' // strict: process.env.NODE_ENV !== 'production'
>>>>>>> upstream/develop
}) })
afterStoreSetup({store, i18n}) afterStoreSetup({store, i18n})