diff --git a/README.md b/README.md index 2174335a..5a3e2a4b 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,6 @@ npm run build npm run unit ``` -For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). +# Configuration + +Edit config.json for configuration. scopeOptionsEnabled gives you input fields for CWs and the scope settings. diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index cc08c8a2..0597d652 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -46,20 +46,23 @@ const PostStatusForm = { error: null, posting: false, highlighted: 0, - vis: { - public: { icon: 'icon-globe', big: true, selected: true }, - unlisted: { icon: 'icon-lock-open-alt', big: true, selected: false }, - private: { icon: 'icon-lock', big: true, selected: false }, - direct: { icon: 'icon-mail-alt', big: true, selected: false } - }, newStatus: { status: statusText, - files: [] + files: [], + visibility: 'public' }, caret: 0 } }, computed: { + vis () { + return { + public: { selected: this.newStatus.visibility === 'public' }, + unlisted: { selected: this.newStatus.visibility === 'unlisted' }, + private: { selected: this.newStatus.visibility === 'private' }, + direct: { selected: this.newStatus.visibility === 'direct' } + } + }, candidates () { const firstchar = this.textAtCaret.charAt(0) if (firstchar === '@') { @@ -124,6 +127,9 @@ const PostStatusForm = { }, isOverLengthLimit () { return this.hasStatusLengthLimit && (this.statusLength > this.statusLengthLimit) + }, + scopeOptionsEnabled () { + return this.$store.state.config.scopeOptionsEnabled } }, methods: { @@ -200,15 +206,13 @@ const PostStatusForm = { if (!data.error) { this.newStatus = { status: '', - files: [] + files: [], + visibility: newStatus.visibility } this.$emit('posted') let el = this.$el.querySelector('textarea') el.style.height = '16px' this.error = null - - for (key in Object.keys(this.vis)) { this.vis[key].selected = false } - this.vis.public.selected = true } else { this.error = data.error } @@ -250,6 +254,7 @@ const PostStatusForm = { e.dataTransfer.dropEffect = 'copy' }, resize (e) { + if (!e.target) { return } const vertPadding = Number(window.getComputedStyle(e.target)['padding-top'].substr(0, 1)) + Number(window.getComputedStyle(e.target)['padding-bottom'].substr(0, 1)) e.target.style.height = 'auto' @@ -262,8 +267,6 @@ const PostStatusForm = { this.error = null }, changeVis (visibility) { - console.log(visibility) - Object.keys(this.vis).forEach(function (x) { this.vis[x].selected = x === visibility }) this.newStatus.visibility = visibility } } diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index dbd11a19..802d51ed 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -3,6 +3,7 @@