{{ $t('recipient') }}
-
+
@@ -39,11 +39,11 @@
@@ -576,7 +576,7 @@ export default Vue.extend({
insertTextAtCursor(this.$refs.text, emoji);
vm.close();
});
- }
+ },
}
});
diff --git a/src/client/components/reactions-viewer.details.vue b/src/client/components/reactions-viewer.details.vue
index 67c8b261b..96d1408fc 100644
--- a/src/client/components/reactions-viewer.details.vue
+++ b/src/client/components/reactions-viewer.details.vue
@@ -1,27 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- +{{ count - 10 }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ +{{ count - 10 }}
+
+
-
-
diff --git a/src/client/components/reactions-viewer.reaction.vue b/src/client/components/reactions-viewer.reaction.vue
index 33911dedb..6b72f2e10 100644
--- a/src/client/components/reactions-viewer.reaction.vue
+++ b/src/client/components/reactions-viewer.reaction.vue
@@ -4,8 +4,10 @@
:class="{ reacted: note.myReaction == reaction, canToggle }"
@click="toggleReaction(reaction)"
v-if="count > 0"
+ @touchstart="onMouseover"
@mouseover="onMouseover"
@mouseleave="onMouseleave"
+ @touchend="onMouseleave"
ref="reaction"
v-particle
>
@@ -90,16 +92,17 @@ export default Vue.extend({
}
},
onMouseover() {
+ if (this.isHovering) return;
this.isHovering = true;
this.detailsTimeoutId = setTimeout(this.openDetails, 300);
},
onMouseleave() {
+ if (!this.isHovering) return;
this.isHovering = false;
clearTimeout(this.detailsTimeoutId);
this.closeDetails();
},
openDetails() {
- if (this.$root.isMobile) return;
this.$root.api('notes/reactions', {
noteId: this.note.id,
type: this.reaction,
diff --git a/src/client/components/ui/tooltip.vue b/src/client/components/ui/tooltip.vue
new file mode 100644
index 000000000..b7a56708b
--- /dev/null
+++ b/src/client/components/ui/tooltip.vue
@@ -0,0 +1,96 @@
+
+
+
+ {{ text }}
+
+
+
+
+
+
+
diff --git a/src/client/components/url.vue b/src/client/components/url.vue
index 4dd23a50e..0a5a5bc50 100644
--- a/src/client/components/url.vue
+++ b/src/client/components/url.vue
@@ -93,13 +93,13 @@ export default Vue.extend({
}
},
onMouseover() {
- if (isDeviceTouch()) return;
+ if (isDeviceTouch) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.showTimer = setTimeout(this.showPreview, 500);
},
onMouseleave() {
- if (isDeviceTouch()) return;
+ if (isDeviceTouch) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.hideTimer = setTimeout(this.closePreview, 500);
diff --git a/src/client/directives/index.ts b/src/client/directives/index.ts
index 64d33c0ff..8cd5ed464 100644
--- a/src/client/directives/index.ts
+++ b/src/client/directives/index.ts
@@ -4,9 +4,11 @@ import userPreview from './user-preview';
import autocomplete from './autocomplete';
import size from './size';
import particle from './particle';
+import tooltip from './tooltip';
Vue.directive('autocomplete', autocomplete);
Vue.directive('userPreview', userPreview);
Vue.directive('user-preview', userPreview);
Vue.directive('size', size);
Vue.directive('particle', particle);
+Vue.directive('tooltip', tooltip);
diff --git a/src/client/directives/tooltip.ts b/src/client/directives/tooltip.ts
new file mode 100644
index 000000000..28d22fc02
--- /dev/null
+++ b/src/client/directives/tooltip.ts
@@ -0,0 +1,62 @@
+import MkTooltip from '../components/ui/tooltip.vue';
+import { isDeviceTouch } from '../scripts/is-device-touch';
+
+const start = isDeviceTouch ? 'touchstart' : 'mouseover';
+const end = isDeviceTouch ? 'touchend' : 'mouseleave';
+
+export default {
+ bind(el: HTMLElement, binding, vn) {
+ const self = (el as any)._tooltipDirective_ = {} as any;
+
+ self.text = binding.value as string;
+ self.tag = null;
+ self.showTimer = null;
+ self.hideTimer = null;
+ self.checkTimer = null;
+
+ self.close = () => {
+ if (self.tag) {
+ clearInterval(self.checkTimer);
+ self.tag.close();
+ self.tag = null;
+ }
+ };
+
+ const show = e => {
+ if (!document.body.contains(el)) return;
+ if (self.tag) return;
+
+ self.tag = new MkTooltip({
+ parent: vn.context,
+ propsData: {
+ text: self.text,
+ source: el
+ }
+ }).$mount();
+
+ document.body.appendChild(self.tag.$el);
+ };
+
+ el.addEventListener(start, () => {
+ clearTimeout(self.showTimer);
+ clearTimeout(self.hideTimer);
+ self.showTimer = setTimeout(show, 300);
+ });
+
+ el.addEventListener(end, () => {
+ clearTimeout(self.showTimer);
+ clearTimeout(self.hideTimer);
+ self.hideTimer = setTimeout(self.close, 300);
+ });
+
+ el.addEventListener('click', () => {
+ clearTimeout(self.showTimer);
+ self.close();
+ });
+ },
+
+ unbind(el, binding, vn) {
+ const self = el._tooltipDirective_;
+ clearInterval(self.checkTimer);
+ },
+};
diff --git a/src/client/scripts/compose-notification.ts b/src/client/scripts/compose-notification.ts
index c3281955e..1552d45e4 100644
--- a/src/client/scripts/compose-notification.ts
+++ b/src/client/scripts/compose-notification.ts
@@ -5,7 +5,7 @@ import { clientDb, get, bulkGet } from '../db';
const getTranslation = (text: string): Promise
=> get(text, clientDb.i18n);
export default async function(type, data): Promise<[string, NotificationOptions]> {
- const contexts = ['deletedNote', 'invisibleNote', 'withNFiles', '_cw.poll'];
+ const contexts = ['deletedNote', 'invisibleNote', 'withNFiles', 'poll'];
const locale = Object.fromEntries(await bulkGet(contexts, clientDb.i18n) as [string, string][]);
switch (type) {
diff --git a/src/client/scripts/is-device-touch.ts b/src/client/scripts/is-device-touch.ts
index 9f439ae4f..3f0bfefed 100644
--- a/src/client/scripts/is-device-touch.ts
+++ b/src/client/scripts/is-device-touch.ts
@@ -1,3 +1 @@
-export function isDeviceTouch(): boolean {
- return 'maxTouchPoints' in navigator && navigator.maxTouchPoints > 0;
-}
+export const isDeviceTouch = 'maxTouchPoints' in navigator && navigator.maxTouchPoints > 0;
diff --git a/src/misc/get-note-summary.ts b/src/misc/get-note-summary.ts
index c23306ab1..7db8bca3e 100644
--- a/src/misc/get-note-summary.ts
+++ b/src/misc/get-note-summary.ts
@@ -27,7 +27,7 @@ const summarize = (note: any, locale: any): string => {
// 投票が添付されているとき
if (note.poll) {
- summary += ` (${locale._cw?.poll || locale['_cw.poll']})`;
+ summary += ` (${locale['poll']})`;
}
// 返信のとき