1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 07:39:43 +02:00

Replace Bootstrap tooltips/popovers/dropdowns

With Ember Attacher component.

This commit removes redundant BS code.

Co-Authored-By: McMatts <matt@documize.com>
This commit is contained in:
sauls8t 2018-12-06 14:10:00 +00:00
parent f05a6fc999
commit 75a19a80f9
44 changed files with 160 additions and 353 deletions

View file

@ -13,12 +13,11 @@ import $ from 'jquery';
import { empty } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import Tooltips from '../../mixins/tooltip';
import Notifier from '../../mixins/notifier';
import Modals from '../../mixins/modal';
import Component from '@ember/component';
export default Component.extend(Tooltips, Notifier, Modals, {
export default Component.extend(Notifier, Modals, {
documentService: service('document'),
sectionService: service('section'),
store: service(),

View file

@ -13,11 +13,10 @@ import { debounce } from '@ember/runloop';
import { computed, set } from '@ember/object';
import { inject as service } from '@ember/service';
import stringUtil from '../../utils/string';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, {
export default Component.extend(ModalMixin, {
link: service(),
linkName: '',
selection: null,
@ -71,12 +70,10 @@ export default Component.extend(ModalMixin, TooltipMixin, {
this._super(...arguments);
this.$('#content-linker-networklocation').removeClass('is-invalid');
this.renderTooltips();
},
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
this.modalClose(this.get('modalId'));
},

View file

@ -9,21 +9,18 @@
//
// https://documize.com
import $ from 'jquery';
import { A } from '@ember/array';
import { computed } from '@ember/object';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import Modals from '../../mixins/modal';
import Tooltips from '../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(Modals, Tooltips, {
export default Component.extend(Modals, {
documentService: service('document'),
sessionService: service('session'),
categoryService: service('category'),
router: service(),
contributorMsg: '',
approverMsg: '',
userChanges: notEmpty('contributorMsg'),
@ -79,69 +76,9 @@ export default Component.extend(Modals, Tooltips, {
this._super(...arguments);
this.workflowStatus();
this.popovers();
this.load();
},
didInsertElement() {
this._super(...arguments);
this.popovers();
this.renderTooltips();
},
willDestroyElement() {
this._super(...arguments);
$('#document-lifecycle-popover').popover('dispose');
$('#document-protection-popover').popover('dispose');
this.removeTooltips();
},
popovers() {
let constants = this.get('constants');
if (this.get('permissions.documentLifecycle')) {
$('#document-lifecycle-popover').addClass('cursor-pointer');
} else {
$('#document-lifecycle-popover').popover('dispose');
$('#document-lifecycle-popover').removeClass('cursor-pointer');
$('#document-lifecycle-popover').popover({
html: true,
title: 'Lifecycle',
content: "<p>Draft &mdash; restricted visiblity and not searchable</p><p>Live &mdash; document visible to all</p><p>Archived &mdash; not visible or searchable</p>",
placement: 'top',
trigger: 'hover click'
});
}
if (this.get('permissions.documentApprove')) {
$('#document-protection-popover').addClass('cursor-pointer');
} else {
$('#document-protection-popover').popover('dispose');
$('#document-protection-popover').removeClass('cursor-pointer');
let ccMsg = `<p>${this.changeControlMsg}</p>`;
if (this.get('document.protection') === constants.ProtectionType.Review) {
ccMsg += '<ul>'
ccMsg += `<li>${this.approvalMsg}</li>`;
if (this.get('userChanges')) ccMsg += `<li>Your contributions: ${this.contributorMsg}</li>`;
if (this.get('isApprover') && this.get('approverMsg.length') > 0) ccMsg += `<li>${this.approverMsg}</li>`;
ccMsg += '</ul>'
}
$('#document-protection-popover').popover({
html: true,
title: 'Change Control',
content: ccMsg,
placement: 'top',
trigger: 'hover click'
});
}
},
workflowStatus() {
let pages = this.get('pages');
let contributorMsg = '';
@ -175,8 +112,6 @@ export default Component.extend(Modals, Tooltips, {
this.set('approverMsg', approverMsg);
this.set('selectedVersion', this.get('versions').findBy('documentId', this.get('document.id')));
this.popovers();
},
load() {

View file

@ -11,9 +11,8 @@
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import TooltipMixin from '../../mixins/tooltip';
export default Component.extend(TooltipMixin, {
export default Component.extend({
documentService: service('document'),
sectionService: service('section'),
editMode: false,

View file

@ -13,10 +13,9 @@ import { computed } from '@ember/object';
import { schedule } from '@ember/runloop';
import { inject as service } from '@ember/service';
import tocUtil from '../../utils/toc';
import TooltipMixin from '../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, {
export default Component.extend({
documentService: service('document'),
emptyState: computed('pages', function () {
return this.get('pages.length') === 0;
@ -54,13 +53,11 @@ export default Component.extend(TooltipMixin, {
didInsertElement() {
this._super(...arguments);
this.eventBus.subscribe('documentPageAdded', this, 'onDocumentPageAdded');
this.renderTooltips();
},
willDestroyElement() {
this._super(...arguments);
this.eventBus.unsubscribe('documentPageAdded');
this.removeTooltips();
},
onDocumentPageAdded(pageId) {

View file

@ -13,12 +13,11 @@ import $ from 'jquery';
import { computed } from '@ember/object';
import { debounce } from '@ember/runloop';
import { inject as service } from '@ember/service';
import Tooltips from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import tocUtil from '../../utils/toc';
import Component from '@ember/component';
export default Component.extend(ModalMixin, Tooltips, {
export default Component.extend(ModalMixin, {
documentService: service('document'),
searchService: service('search'),
router: service(),
@ -78,14 +77,6 @@ export default Component.extend(ModalMixin, Tooltips, {
this.setState(this.get('page.id'));
},
didInsertElement() {
this._super(...arguments);
if (this.get('session.authenticated')) {
this.renderTooltips();
}
},
searchDocs() {
let payload = { keywords: this.get('docSearchFilter').trim(), doc: true };
if (payload.keywords.length == 0) return;

View file

@ -13,11 +13,10 @@ import $ from 'jquery';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import TooltipMixin from '../../mixins/tooltip';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, Notifier, {
export default Component.extend(Notifier, {
documentService: service('document'),
sectionService: service('section'),
store: service(),
@ -49,21 +48,9 @@ export default Component.extend(TooltipMixin, Notifier, {
didInsertElement() {
this._super(...arguments);
if (this.get('session.authenticated')) {
this.renderTooltips();
}
this.jumpToSection(this.get('currentPageId'));
},
willDestroyElement() {
this._super(...arguments);
if (this.get('session.authenticated')) {
this.removeTooltips();
}
},
contentLinkHandler() {
let links = this.get('link');
let doc = this.get('document');