This commit is contained in:
syuilo 2020-01-30 07:53:19 +09:00
parent 964bfb36d8
commit fb9fed545e
3 changed files with 457 additions and 476 deletions

View file

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.0.0-alpha.11",
"version": "12.0.0-alpha.12",
"codename": "indigo",
"repository": {
"type": "git",
@ -38,9 +38,9 @@
"@fortawesome/vue-fontawesome": "0.1.9",
"@koa/cors": "3.0.0",
"@koa/multer": "2.0.2",
"@koa/router": "8.0.5",
"@koa/router": "8.0.6",
"@types/bcryptjs": "2.4.2",
"@types/bull": "3.10.6",
"@types/bull": "3.12.0",
"@types/cbor": "5.0.0",
"@types/dateformat": "3.0.1",
"@types/double-ended-queue": "2.1.1",
@ -49,7 +49,7 @@
"@types/gulp-rename": "0.0.33",
"@types/gulp-replace": "0.0.31",
"@types/is-url": "1.2.28",
"@types/js-yaml": "3.12.1",
"@types/js-yaml": "3.12.2",
"@types/jsdom": "12.2.4",
"@types/katex": "0.11.0",
"@types/koa": "2.11.0",
@ -61,17 +61,17 @@
"@types/koa-mount": "4.0.0",
"@types/koa-send": "4.1.2",
"@types/koa-views": "2.0.4",
"@types/koa__cors": "3.0.0",
"@types/koa__cors": "3.0.1",
"@types/koa__multer": "2.0.1",
"@types/koa__router": "8.0.2",
"@types/lolex": "5.1.0",
"@types/mocha": "5.2.7",
"@types/node": "13.1.4",
"@types/mocha": "7.0.1",
"@types/node": "13.5.2",
"@types/nodemailer": "6.4.0",
"@types/nprogress": "0.2.0",
"@types/oauth": "0.9.1",
"@types/parse5": "5.0.2",
"@types/parsimmon": "1.10.0",
"@types/parsimmon": "1.10.1",
"@types/portscanner": "2.1.0",
"@types/pug": "2.0.4",
"@types/qrcode": "1.3.4",
@ -84,29 +84,27 @@
"@types/request-stats": "3.0.0",
"@types/rimraf": "2.0.3",
"@types/seedrandom": "2.4.28",
"@types/sharp": "0.23.1",
"@types/sharp": "0.24.0",
"@types/showdown": "1.9.3",
"@types/speakeasy": "2.0.5",
"@types/systeminformation": "3.54.1",
"@types/tinycolor2": "1.4.2",
"@types/tmp": "0.1.0",
"@types/uuid": "3.4.6",
"@types/uuid": "3.4.7",
"@types/web-push": "3.3.0",
"@types/webpack": "4.41.1",
"@types/webpack-stream": "3.2.10",
"@types/websocket": "1.0.0",
"@types/ws": "6.0.4",
"@typescript-eslint/parser": "2.15.0",
"@types/ws": "7.2.1",
"@typescript-eslint/parser": "2.18.0",
"agentkeepalive": "4.1.0",
"animejs": "3.1.0",
"apexcharts": "3.12.0",
"apexcharts": "3.15.3",
"autobind-decorator": "2.4.0",
"autosize": "4.0.2",
"autwh": "0.1.0",
"aws-sdk": "2.598.0",
"aws-sdk": "2.610.0",
"bcryptjs": "2.4.3",
"bootstrap": "4.4.1",
"bootstrap-vue": "2.1.0",
"bull": "3.12.1",
"cafy": "15.2.1",
"cbor": "5.0.1",
@ -117,7 +115,7 @@
"commander": "4.1.0",
"content-disposition": "0.5.3",
"crc-32": "1.2.0",
"css-loader": "3.4.1",
"css-loader": "3.4.2",
"cssnano": "4.1.10",
"dateformat": "3.0.3",
"diskusage": "1.1.3",
@ -127,7 +125,7 @@
"eventemitter3": "4.0.0",
"feed": "4.1.0",
"fibers": "4.0.2",
"file-type": "13.0.1",
"file-type": "13.1.2",
"fluent-ffmpeg": "2.1.2",
"gulp": "4.0.2",
"gulp-clean-css": "4.2.0",
@ -145,9 +143,9 @@
"https-proxy-agent": "4.0.0",
"insert-text-at-cursor": "0.3.0",
"is-root": "2.1.0",
"is-svg": "4.2.0",
"is-svg": "4.2.1",
"js-yaml": "3.13.1",
"jsdom": "15.2.1",
"jsdom": "16.0.1",
"json5": "2.1.1",
"json5-loader": "3.0.0",
"jsrsasign": "8.0.12",
@ -166,11 +164,11 @@
"loader-utils": "1.2.3",
"lolex": "5.1.2",
"lookup-dns-cache": "2.1.0",
"mocha": "7.0.0",
"mocha": "7.0.1",
"moji": "0.5.1",
"ms": "2.1.2",
"multer": "1.4.2",
"nested-property": "1.0.2",
"nested-property": "1.0.4",
"node-fetch": "2.6.0",
"nodemailer": "6.4.2",
"nprogress": "0.2.0",
@ -178,13 +176,13 @@
"os-utils": "0.0.14",
"parse5": "5.1.1",
"parsimmon": "1.13.0",
"pg": "7.17.0",
"pg": "7.18.0",
"portal-vue": "2.1.7",
"portscanner": "2.2.0",
"postcss-loader": "3.0.0",
"prismjs": "1.18.0",
"prismjs": "1.19.0",
"probe-image-size": "5.0.0",
"progress-bar-webpack-plugin": "1.12.1",
"progress-bar-webpack-plugin": "2.1.0",
"promise-limit": "2.7.0",
"promise-sequential": "1.1.1",
"pug": "2.0.4",
@ -204,36 +202,36 @@
"request-promise-native": "1.0.8",
"request-stats": "3.0.0",
"require-all": "3.0.0",
"rimraf": "3.0.0",
"rimraf": "3.0.1",
"rndstr": "1.0.0",
"s-age": "1.1.2",
"sass": "1.25.0",
"sass-loader": "8.0.1",
"sass-loader": "8.0.2",
"seedrandom": "3.0.5",
"sharp": "0.23.4",
"sharp": "0.24.0",
"showdown": "1.9.1",
"showdown-highlightjs-extension": "0.1.2",
"speakeasy": "2.0.0",
"stringz": "2.0.0",
"style-loader": "1.1.2",
"style-loader": "1.1.3",
"summaly": "2.3.1",
"syslog-pro": "1.0.0",
"systeminformation": "4.17.3",
"systeminformation": "4.21.0",
"syuilo-password-strength": "0.0.1",
"terser-webpack-plugin": "2.3.1",
"terser-webpack-plugin": "2.3.3",
"textarea-caret": "3.1.0",
"three": "0.112.1",
"tinycolor2": "1.4.1",
"tmp": "0.1.0",
"ts-loader": "6.2.1",
"ts-node": "8.5.4",
"tslint": "5.20.1",
"ts-node": "8.6.2",
"tslint": "6.0.0",
"tslint-sonarts": "1.9.0",
"typeorm": "0.2.22",
"typescript": "3.7.4",
"typescript": "3.7.5",
"ulid": "2.3.0",
"url-loader": "3.0.0",
"uuid": "3.3.3",
"uuid": "3.4.0",
"v-animate-css": "0.0.3",
"v-debounce": "0.1.2",
"vue": "2.6.11",
@ -244,12 +242,12 @@
"vue-json-pretty": "1.6.3",
"vue-loader": "15.8.3",
"vue-marquee-text-component": "1.1.1",
"vue-meta": "2.3.1",
"vue-meta": "2.3.2",
"vue-prism-component": "1.1.1",
"vue-router": "3.1.3",
"vue-router": "3.1.5",
"vue-sequential-entrance": "1.1.3",
"vue-style-loader": "4.1.2",
"vue-svg-inline-loader": "1.4.4",
"vue-svg-inline-loader": "1.4.5",
"vue-template-compiler": "2.6.11",
"vuedraggable": "2.23.2",
"vuex": "3.1.2",

View file

@ -60,7 +60,6 @@ import i18n from '../i18n';
import MkVisibilityChooser from './visibility-chooser.vue';
import MkUserSelect from './user-select.vue';
import XNotePreview from './note-preview.vue';
import XEmojiPicker from './emoji-picker.vue';
import { parse } from '../../mfm/parse';
import { host, url } from '../config';
import { erase, unique } from '../../prelude/array';
@ -543,8 +542,8 @@ export default Vue.extend({
});
},
insertEmoji(ev) {
const vm = this.$root.new(XEmojiPicker, {
async insertEmoji(ev) {
const vm = this.$root.new(await import('./emoji-picker.vue').then(m => m.default), {
source: ev.currentTarget || ev.target
}).$once('chosen', emoji => {
insertTextAtCursor(this.$refs.text, emoji);

854
yarn.lock

File diff suppressed because it is too large Load diff