sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'revert-295becd6' into 'develop' 

Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'"

See merge request pleroma/pleroma-fe!580
This commit is contained in:
HJ 2019-02-14 19:09:32 +00:00
parent 295becd6c8 ee4c6f362b
commit dfecbe0ab7
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/autocomplete_input/autocomplete_input.js
View File

@ -24,7 +24,8 @@ const AutoCompleteInput = {
data () { data () {
return { return {
caret: 0, caret: 0,
highlighted: 0 highlighted: 0,
text: this.value
} }
}, },
computed: { computed: {
@ -41,7 +42,7 @@ const AutoCompleteInput = {
return (this.wordAtCaret || {}).word || '' return (this.wordAtCaret || {}).word || ''
}, },
wordAtCaret () { wordAtCaret () {
const word = Completion.wordAtPosition(this.value, this.caret - 1) || {} const word = Completion.wordAtPosition(this.text, this.caret - 1) || {}
return word return word
}, },
candidates () { candidates () {
@ -112,8 +113,8 @@ const AutoCompleteInput = {
} }
}, },
replace (replacement) { replace (replacement) {
this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement)) this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
const el = this.$el.querySelector('textarea') || this.$el.querySelector('input') const el = this.$el.querySelector('textarea')
el.focus() el.focus()
this.caret = 0 this.caret = 0
}, },
@ -124,7 +125,8 @@ const AutoCompleteInput = {
e.preventDefault() e.preventDefault()
const candidate = this.candidates[this.highlighted] const candidate = this.candidates[this.highlighted]
const replacement = candidate.utf || (candidate.screen_name + ' ') const replacement = candidate.utf || (candidate.screen_name + ' ')
this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement)) this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
this.$emit('input', this.text)
const el = this.$el.querySelector('textarea') || this.$el.querySelector('input') const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
el.focus() el.focus()
this.caret = 0 this.caret = 0

28
src/components/autocomplete_input/autocomplete_input.vue
View File

@ -4,8 +4,8 @@
v-if="multiline" v-if="multiline"
ref="textarea" ref="textarea"
rows="1" rows="1"
:value="value" :class="classObj" :id="id" :placeholder="placeholder" :value="text" :class="classObj" :id="id" :placeholder="placeholder"
@input="$emit('input', $event.target.value), autoResize && resize($event)" @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)"
@click="setCaret" @click="setCaret"
@keyup="setCaret" @keyup="setCaret"
@keydown.down="cycleForward" @keydown.down="cycleForward"
@ -13,17 +13,17 @@
@keydown.shift.tab="cycleBackward" @keydown.shift.tab="cycleBackward"
@keydown.tab="cycleForward" @keydown.tab="cycleForward"
@keydown.enter="replaceCandidate" @keydown.enter="replaceCandidate"
@drop="drop && drop($event)" @drop="drop && drop()"
@dragover.prevent="dragoverPrevent && dragoverPrevent($event)" @dragover.prevent="dragoverPrevent && dragoverPrevent()"
@paste="paste && paste($event)" @paste="paste && paste()"
@keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)" @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
@keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)"> @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()">
</textarea> </textarea>
<input <input
v-else v-else
ref="textarea" ref="textarea"
:value="value" :class="classObj" :id="id" :placeholder="placeholder" :value="text" :class="classObj" :id="id" :placeholder="placeholder"
@input="$emit('input', $event.target.value), autoResize && resize($event)" @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)"
@click="setCaret" @click="setCaret"
@keyup="setCaret" @keyup="setCaret"
@keydown.down="cycleForward" @keydown.down="cycleForward"
@ -31,11 +31,11 @@
@keydown.shift.tab="cycleBackward" @keydown.shift.tab="cycleBackward"
@keydown.tab="cycleForward" @keydown.tab="cycleForward"
@keydown.enter="replaceCandidate" @keydown.enter="replaceCandidate"
@drop="drop && drop($event)" @drop="drop && drop()"
@dragover.prevent="dragoverPrevent && dragoverPrevent($event)" @dragover.prevent="dragoverPrevent && dragoverPrevent()"
@paste="paste && paste($event)" @paste="paste && paste()"
@keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)" @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()"
@keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)"/> @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()"/>
<div style="position:relative;" v-if="candidates"> <div style="position:relative;" v-if="candidates">
<div class="autocomplete-panel"> <div class="autocomplete-panel">
<div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))"> <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))">