-
-
@@ -49,7 +49,7 @@ export default {
diff --git a/src/components/UserImage.vue b/src/components/UserImage.vue
index cf73f96a..c375eea7 100644
--- a/src/components/UserImage.vue
+++ b/src/components/UserImage.vue
@@ -10,13 +10,11 @@ export default {
props: ['userId'],
computed: {
url() {
- const userInfo = this.$store.state.userInfo.itemMap[this.userId];
+ userSvc.getInfo(this.userId);
+ const userInfo = this.$store.state.userInfo.itemsById[this.userId];
return userInfo && userInfo.imageUrl && `url('${userInfo.imageUrl}')`;
},
},
- created() {
- userSvc.getInfo(this.userId);
- },
};
diff --git a/src/components/UserName.vue b/src/components/UserName.vue
index e26a8a7f..895e74be 100644
--- a/src/components/UserName.vue
+++ b/src/components/UserName.vue
@@ -9,12 +9,10 @@ export default {
props: ['userId'],
computed: {
name() {
- const userInfo = this.$store.state.userInfo.itemMap[this.userId];
+ userSvc.getInfo(this.userId);
+ const userInfo = this.$store.state.userInfo.itemsById[this.userId];
return userInfo ? userInfo.name : 'Someone';
},
},
- created() {
- userSvc.getInfo(this.userId);
- },
};
diff --git a/src/components/common/EditorClassApplier.js b/src/components/common/EditorClassApplier.js
index 98b0032a..bc9bf9db 100644
--- a/src/components/common/EditorClassApplier.js
+++ b/src/components/common/EditorClassApplier.js
@@ -1,4 +1,4 @@
-import cledit from '../../services/cledit';
+import cledit from '../../services/editor/cledit';
import editorSvc from '../../services/editorSvc';
import utils from '../../services/utils';
@@ -10,7 +10,9 @@ const nextTickExecCbs = cledit.Utils.debounce(() => {
}
if (savedSelection) {
editorSvc.clEditor.selectionMgr.setSelectionStartEnd(
- savedSelection.start, savedSelection.end);
+ savedSelection.start,
+ savedSelection.end,
+ );
}
savedSelection = null;
});
diff --git a/src/components/common/PreviewClassApplier.js b/src/components/common/PreviewClassApplier.js
index acbe7403..58d9bd59 100644
--- a/src/components/common/PreviewClassApplier.js
+++ b/src/components/common/PreviewClassApplier.js
@@ -1,4 +1,4 @@
-import cledit from '../../services/cledit';
+import cledit from '../../services/editor/cledit';
import editorSvc from '../../services/editorSvc';
import utils from '../../services/utils';
@@ -40,14 +40,22 @@ export default class PreviewClassApplier {
const offset = this.offsetGetter();
if (offset) {
const offsetStart = editorSvc.getPreviewOffset(
- offset.start, editorSvc.previewCtx.sectionDescList);
+ offset.start,
+ editorSvc.previewCtx.sectionDescList,
+ );
const offsetEnd = editorSvc.getPreviewOffset(
- offset.end, editorSvc.previewCtx.sectionDescList);
+ offset.end,
+ editorSvc.previewCtx.sectionDescList,
+ );
if (offsetStart != null && offsetEnd != null && offsetStart !== offsetEnd) {
const start = cledit.Utils.findContainer(
- editorSvc.previewElt, Math.min(offsetStart, offsetEnd));
+ editorSvc.previewElt,
+ Math.min(offsetStart, offsetEnd),
+ );
const end = cledit.Utils.findContainer(
- editorSvc.previewElt, Math.max(offsetStart, offsetEnd));
+ editorSvc.previewElt,
+ Math.max(offsetStart, offsetEnd),
+ );
const range = document.createRange();
range.setStart(start.container, start.offsetInContainer);
range.setEnd(end.container, end.offsetInContainer);
diff --git a/src/components/common/vueGlobals.js b/src/components/common/vueGlobals.js
new file mode 100644
index 00000000..961bc91d
--- /dev/null
+++ b/src/components/common/vueGlobals.js
@@ -0,0 +1,80 @@
+import Vue from 'vue';
+import Clipboard from 'clipboard';
+import timeSvc from '../../services/timeSvc';
+import store from '../../store';
+
+// Global directives
+Vue.directive('focus', {
+ inserted(el) {
+ el.focus();
+ const { value } = el;
+ if (value && el.setSelectionRange) {
+ el.setSelectionRange(0, value.length);
+ }
+ },
+});
+
+const setVisible = (el, value) => {
+ el.style.display = value ? '' : 'none';
+ if (value) {
+ el.removeAttribute('aria-hidden');
+ } else {
+ el.setAttribute('aria-hidden', 'true');
+ }
+};
+Vue.directive('show', {
+ bind(el, { value }) {
+ setVisible(el, value);
+ },
+ update(el, { value, oldValue }) {
+ if (value !== oldValue) {
+ setVisible(el, value);
+ }
+ },
+});
+
+const setElTitle = (el, title) => {
+ el.title = title;
+ el.setAttribute('aria-label', title);
+};
+Vue.directive('title', {
+ bind(el, { value }) {
+ setElTitle(el, value);
+ },
+ update(el, { value, oldValue }) {
+ if (value !== oldValue) {
+ setElTitle(el, value);
+ }
+ },
+});
+
+// Clipboard directive
+const createClipboard = (el, value) => {
+ el.seClipboard = new Clipboard(el, { text: () => value });
+};
+const destroyClipboard = (el) => {
+ if (el.seClipboard) {
+ el.seClipboard.destroy();
+ el.seClipboard = null;
+ }
+};
+Vue.directive('clipboard', {
+ bind(el, { value }) {
+ createClipboard(el, value);
+ },
+ update(el, { value, oldValue }) {
+ if (value !== oldValue) {
+ destroyClipboard(el);
+ createClipboard(el, value);
+ }
+ },
+ unbind(el) {
+ destroyClipboard(el);
+ },
+});
+
+// Global filters
+Vue.filter('formatTime', time =>
+ // Access the minute counter for reactive refresh
+ timeSvc.format(time, store.state.minuteCounter));
+
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index 594020ce..1651ac10 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -47,11 +47,13 @@ export default {
...mapMutations('discussion', [
'setIsCommenting',
]),
- removeComment() {
- this.$store.dispatch('modal/commentDeletion')
- .then(
- () => this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment }),
- () => {}); // Cancel
+ async removeComment() {
+ try {
+ await this.$store.dispatch('modal/open', 'commentDeletion');
+ this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment });
+ } catch (e) {
+ // Cancel
+ }
},
},
mounted() {
@@ -63,8 +65,7 @@ export default {
let scrollerMirrorElt;
const getScrollerMirrorElt = () => {
if (!scrollerMirrorElt) {
- scrollerMirrorElt = document.querySelector(
- `.comment-list .comment--${commentId} .comment__text-inner`);
+ scrollerMirrorElt = document.querySelector(`.comment-list .comment--${commentId} .comment__text-inner`);
}
return scrollerMirrorElt || { scrollTop: 0 };
};
diff --git a/src/components/gutters/CommentList.vue b/src/components/gutters/CommentList.vue
index 525b2f04..2f3ec2f5 100644
--- a/src/components/gutters/CommentList.vue
+++ b/src/components/gutters/CommentList.vue
@@ -107,10 +107,13 @@ export default {
this.currentDiscussionLastCommentId
&& this.$el.querySelector(`.comment--${this.currentDiscussionLastCommentId}`),
this.$el.querySelector('.comment--new'),
- true);
+ true,
+ );
} else {
- tops[discussionId] = getTop(discussion,
- this.$el.querySelector(`.comment--discussion-${discussionId}`));
+ tops[discussionId] = getTop(
+ discussion,
+ this.$el.querySelector(`.comment--discussion-${discussionId}`),
+ );
}
});
this.tops = tops;
@@ -120,7 +123,8 @@ export default {
this.$watch(
() => this.updateTopsTrigger,
() => this.updateTops(),
- { immediate: true });
+ { immediate: true },
+ );
const layoutSettings = this.$store.getters['data/layoutSettings'];
this.scrollerElt = layoutSettings.showEditor
@@ -161,7 +165,8 @@ export default {
this.$watch(
() => this.updateStickyTrigger,
() => this.updateSticky(),
- { immediate: true });
+ { immediate: true },
+ );
// Move preview discussions once previewCtxWithDiffs has been calculated
if (!editorSvc.previewCtxWithDiffs) {
@@ -178,7 +183,7 @@ export default {
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue
index 1048e398..0b717522 100644
--- a/src/components/modals/TemplatesModal.vue
+++ b/src/components/modals/TemplatesModal.vue
@@ -45,7 +45,7 @@