diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-14 14:50:58 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-14 14:50:58 +0000 |
| commit | 295becd6c8cf8d6f628be74a14d8f28361c1923a (patch) | |
| tree | d7b73325de8a2fc6c7d02a7dbdee7d0e6aefb4fb /src/components/autocomplete_input/autocomplete_input.vue | |
| parent | 40b51b659eb89df3c2a841ddf93452314f609678 (diff) | |
| parent | 19dd36945ab91ad3a1cff9ddbbfadea437b75d6f (diff) | |
Merge branch 'hotfix/issues-in-autocomplete' into 'develop'
#355 hotfix/issues in autocomplete
Closes #355
See merge request pleroma/pleroma-fe!574
Diffstat (limited to 'src/components/autocomplete_input/autocomplete_input.vue')
| -rw-r--r-- | src/components/autocomplete_input/autocomplete_input.vue | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/components/autocomplete_input/autocomplete_input.vue b/src/components/autocomplete_input/autocomplete_input.vue index 56233535..1e26b76b 100644 --- a/src/components/autocomplete_input/autocomplete_input.vue +++ b/src/components/autocomplete_input/autocomplete_input.vue @@ -4,8 +4,8 @@ v-if="multiline" ref="textarea" rows="1" - :value="text" :class="classObj" :id="id" :placeholder="placeholder" - @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" + :value="value" :class="classObj" :id="id" :placeholder="placeholder" + @input="$emit('input', $event.target.value), autoResize && resize($event)" @click="setCaret" @keyup="setCaret" @keydown.down="cycleForward" @@ -13,17 +13,17 @@ @keydown.shift.tab="cycleBackward" @keydown.tab="cycleForward" @keydown.enter="replaceCandidate" - @drop="drop && drop()" - @dragover.prevent="dragoverPrevent && dragoverPrevent()" - @paste="paste && paste()" - @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()" - @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()"> + @drop="drop && drop($event)" + @dragover.prevent="dragoverPrevent && dragoverPrevent($event)" + @paste="paste && paste($event)" + @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)" + @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)"> </textarea> <input v-else ref="textarea" - :value="text" :class="classObj" :id="id" :placeholder="placeholder" - @input="text = $event.target.value, $emit('input', $event.target.value), autoResize && resize($event)" + :value="value" :class="classObj" :id="id" :placeholder="placeholder" + @input="$emit('input', $event.target.value), autoResize && resize($event)" @click="setCaret" @keyup="setCaret" @keydown.down="cycleForward" @@ -31,11 +31,11 @@ @keydown.shift.tab="cycleBackward" @keydown.tab="cycleForward" @keydown.enter="replaceCandidate" - @drop="drop && drop()" - @dragover.prevent="dragoverPrevent && dragoverPrevent()" - @paste="paste && paste()" - @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter()" - @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter()"/> + @drop="drop && drop($event)" + @dragover.prevent="dragoverPrevent && dragoverPrevent($event)" + @paste="paste && paste($event)" + @keydown.meta.enter="keydownMetaEnter && keydownMetaEnter($event)" + @keyup.ctrl.enter="keyupCtrlEnter && keyupCtrlEnter($event)"/> <div style="position:relative;" v-if="candidates"> <div class="autocomplete-panel"> <div v-for="candidate in candidates" @click="replace(candidate.utf || (candidate.screen_name + ' '))"> |