Merge remote-tracking branch 'origin/develop' into setttingssync
This commit is contained in:
commit
44ae68b025
22 changed files with 180 additions and 76 deletions
|
|
@ -6,7 +6,6 @@ import DraftCloser from 'src/components/draft_closer/draft_closer.vue'
|
|||
import Gallery from 'src/components/gallery/gallery.vue'
|
||||
import Popover from 'src/components/popover/popover.vue'
|
||||
import { propsToNative } from '../../services/attributes_helper/attributes_helper.service.js'
|
||||
import fileTypeService from '../../services/file_type/file_type.service.js'
|
||||
import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
|
||||
import genRandomSeed from '../../services/random_seed/random_seed.service.js'
|
||||
import statusPoster from '../../services/status_poster/status_poster.service.js'
|
||||
|
|
@ -650,9 +649,6 @@ const PostStatusForm = {
|
|||
this.$emit('resize')
|
||||
this.uploadingFiles = false
|
||||
},
|
||||
type(fileInfo) {
|
||||
return fileTypeService.fileType(fileInfo.mimetype)
|
||||
},
|
||||
paste(e) {
|
||||
this.autoPreview()
|
||||
this.resize(e)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue