Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

Replace Bootstrap tooltips/popovers/dropdowns

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
gui/app/components/customize/user-list.js
View file

@ -12,12 +12,11 @@
import $ from 'jquery';
import { inject as service } from '@ember/service';
import { schedule, debounce } from '@ember/runloop';
import TooltipMixin from '../../mixins/tooltip';
import AuthProvider from '../../mixins/auth';
import ModalMixin from '../../mixins/modal';
import Component from '@ember/component';
export default Component.extend(AuthProvider, ModalMixin, TooltipMixin, {
export default Component.extend(AuthProvider, ModalMixin, {
groupSvc: service('group'),
editUser: null,
deleteUser: null,
@ -46,13 +45,6 @@ export default Component.extend(AuthProvider, ModalMixin, TooltipMixin, {
});
this.set('users', users);
this.renderTooltips();
},
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
},
onKeywordChange: function () {

3
gui/app/components/document/add-section.js
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(),

5
gui/app/components/document/content-linker.js
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'));
},

67
gui/app/components/document/document-meta.js
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() {

3
gui/app/components/document/document-page.js
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,

5
gui/app/components/document/document-toc.js
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) {

11
gui/app/components/document/page-heading.js
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;

15
gui/app/components/document/view-content.js
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');

4
gui/app/components/folder/documents-list.js
View file

@ -11,10 +11,9 @@
import { computed } from '@ember/object';
import { A } from '@ember/array';
import TooltipMixin from '../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, {
export default Component.extend({
showDeleteDialog: false,
showMoveDialog: false,
selectedDocuments: A([]),
@ -105,7 +104,6 @@ export default Component.extend(TooltipMixin, {
this.set('selectedCaption', list.length > 1 ? 'documents' : 'document');
this.set('selectedDocuments', A(list));
this.renderTooltips();
}
}
});

10
gui/app/components/folder/settings-category.js
View file

@ -12,19 +12,17 @@
import $ from 'jquery';
import { A } from '@ember/array';
import { inject as service } from '@ember/service';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import Notifer from '../../mixins/notifier';
import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, Notifer, {
export default Component.extend(ModalMixin, Notifer, {
spaceSvc: service('folder'),
groupSvc: service('group'),
categorySvc: service('category'),
appMeta: service(),
store: service(),
deleteId: '',
dropdown: null,
newCategory: '',
init() {
@ -34,13 +32,11 @@ export default Component.extend(ModalMixin, TooltipMixin, Notifer, {
didReceiveAttrs() {
this._super(...arguments);
this.renderTooltips();
this.load();
},
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
},
load() {
@ -143,13 +139,11 @@ export default Component.extend(ModalMixin, TooltipMixin, Notifer, {
onEdit(id) {
this.setEdit(id, true);
this.removeTooltips();
},
onEditCancel(id) {
this.setEdit(id, false);
this.load();
this.renderTooltips();
},
onSave(id) {
@ -165,8 +159,6 @@ export default Component.extend(ModalMixin, TooltipMixin, Notifer, {
this.get('categorySvc').save(cat).then(() => {
this.load();
});
this.renderTooltips();
},
onShowAccessPicker(catId) {

6
gui/app/components/layout/top-bar.js
View file

@ -13,10 +13,9 @@ import $ from 'jquery';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service'
import ModalMixin from '../../mixins/modal';
import TooltipMixin from '../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, {
export default Component.extend(ModalMixin, {
classNames: ['layout-header', 'non-printable'],
tagName: 'header',
folderService: service('folder'),
@ -70,8 +69,6 @@ export default Component.extend(ModalMixin, TooltipMixin, {
this.eventBus.subscribe('pinChange', this, 'setupPins');
this.setupPins();
}
this.renderTooltips();
},
setupPins() {
@ -90,7 +87,6 @@ export default Component.extend(ModalMixin, TooltipMixin, {
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
this.eventBus.unsubscribe('pinChange');
},

7
gui/app/components/section/base-editor-inline.js
View file

@ -12,11 +12,10 @@
import $ from 'jquery';
import { empty } from '@ember/object/computed';
import { computed } from '@ember/object';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, ModalMixin, {
export default Component.extend(ModalMixin, {
busy: false,
mousetrap: null,
showLinkModal: false,
@ -57,15 +56,11 @@ export default Component.extend(TooltipMixin, ModalMixin, {
$('#' + this.get('pageId')).focus(function() {
$(this).select();
});
this.renderTooltips();
},
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
let mousetrap = this.get('mousetrap');
if (is.not.null(mousetrap)) {
mousetrap.unbind('esc');

6
gui/app/components/section/code/type-editor.js
View file

@ -10,10 +10,9 @@
// https://documize.com
import { computed } from '@ember/object';
import TooltipMixin from '../../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, {
export default Component.extend({
isDirty: false,
pageBody: "",
codeSyntax: null,
@ -100,9 +99,6 @@ export default Component.extend(TooltipMixin, {
editor = null;
this.set('codeEditor', null);
}
this.removeTooltips();
},
// Wrap code in PRE tag with language identifier for subsequent rendering.

8
gui/app/components/section/gemini/type-editor.js
View file

@ -13,11 +13,10 @@ import $ from 'jquery';
import { set } from '@ember/object';
import { schedule } from '@ember/runloop';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import SectionMixin from '../../../mixins/section';
import TooltipMixin from '../../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(SectionMixin, TooltipMixin, {
export default Component.extend(SectionMixin, {
sectionService: service('section'),
isDirty: false,
waiting: false,
@ -27,7 +26,7 @@ export default Component.extend(SectionMixin, TooltipMixin, {
this._super(...arguments);
this.user = {};
this.workspaces = [];
this.config = {};
this.config = {};
},
didReceiveAttrs() {
@ -92,7 +91,6 @@ export default Component.extend(SectionMixin, TooltipMixin, {
schedule('afterRender', () => {
window.scrollTo(0, document.body.scrollHeight);
self.renderTooltips();
});
self.set('waiting', false);
}, function (reason) { // eslint-disable-line no-unused-vars

5
gui/app/components/section/jira/type-editor.js
View file

@ -10,11 +10,10 @@
// https://documize.com
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import SectionMixin from '../../../mixins/section';
import TooltipMixin from '../../../mixins/tooltip';
import Component from '@ember/component';
export default Component.extend(SectionMixin, TooltipMixin, {
export default Component.extend(SectionMixin, {
sectionService: service('section'),
isDirty: false,
waiting: false,

9
gui/app/components/section/trello/type-editor.js
View file

@ -14,12 +14,11 @@ import $ from 'jquery';
import { htmlSafe } from '@ember/string';
import { computed, set } from '@ember/object';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import NotifierMixin from '../../../mixins/notifier';
import TooltipMixin from '../../../mixins/tooltip';
import SectionMixin from '../../../mixins/section';
import Component from '@ember/component';
export default Component.extend(SectionMixin, NotifierMixin, TooltipMixin, {
export default Component.extend(SectionMixin, NotifierMixin, {
sectionService: service('section'),
isDirty: false,
busy: false,
@ -93,10 +92,6 @@ export default Component.extend(SectionMixin, NotifierMixin, TooltipMixin, {
});
},
willDestroyElement() {
this.removeTooltips();
},
getBoardLists() {
this.set('busy', true);

5
gui/app/components/spaces/space-list.js
View file

@ -9,12 +9,11 @@
//
// https://documize.com
import Component from '@ember/component';
import TooltipMixin from '../../mixins/tooltip';
import NotifierMixin from '../../mixins/notifier';
import AuthMixin from '../../mixins/auth';
import Component from '@ember/component';
export default Component.extend(TooltipMixin, NotifierMixin, AuthMixin, {
export default Component.extend(NotifierMixin, AuthMixin, {
hasPublicFolders: false,
hasProtectedFolders: false,
hasPrivateFolders: false,

9
gui/app/components/toolbar/for-document.js
View file

@ -12,12 +12,11 @@
import $ from 'jquery';
import { inject as service } from '@ember/service';
import AuthMixin from '../../mixins/auth';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
export default Component.extend(ModalMixin, AuthMixin, Notifier, {
store: service(),
spaceSvc: service('folder'),
session: service(),
@ -49,7 +48,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
this.set('pinState.pinId', pinId);
this.set('pinState.isPinned', pinId !== '');
this.set('pinState.newName', doc.get('name'));
this.renderTooltips();
});
this.set('saveTemplate.name', this.get('document.name'));
@ -63,7 +61,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
},
actions: {
@ -80,11 +77,9 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
onUnpin() {
this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
$('#document-pin-button').tooltip('dispose');
this.set('pinState.isPinned', false);
this.set('pinState.pinId', '');
this.eventBus.publish('pinChange');
this.renderTooltips();
});
},
@ -96,11 +91,9 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
};
this.get('pinned').pinItem(pin).then((pin) => {
$('#document-pin-button').tooltip('dispose');
this.set('pinState.isPinned', true);
this.set('pinState.pinId', pin.get('id'));
this.eventBus.publish('pinChange');
this.renderTooltips();
});
return true;

9
gui/app/components/toolbar/for-space.js
View file

@ -13,13 +13,12 @@ import $ from 'jquery';
import { computed } from '@ember/object';
import { schedule } from '@ember/runloop';
import { inject as service } from '@ember/service';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import AuthMixin from '../../mixins/auth';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
export default Component.extend(ModalMixin, AuthMixin, Notifier, {
spaceService: service('folder'),
localStorage: service(),
templateService: service('template'),
@ -75,7 +74,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
this.set('pinState.pinId', pinId);
this.set('pinState.isPinned', pinId !== '');
this.set('pinState.newName', folder.get('name'));
this.renderTooltips();
});
let cats = this.get('categories');
@ -92,7 +90,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
willDestroyElement() {
this._super(...arguments);
this.removeTooltips();
if (is.not.null(this.get('dropzone'))) {
this.get('dropzone').destroy();
@ -152,11 +149,9 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
actions: {
onUnpin() {
this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
$('#space-pin-button').tooltip('dispose');
this.set('pinState.isPinned', false);
this.set('pinState.pinId', '');
this.eventBus.publish('pinChange');
this.renderTooltips();
});
},
@ -168,11 +163,9 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
};
this.get('pinned').pinItem(pin).then((pin) => {
$('#space-pin-button').tooltip('dispose');
this.set('pinState.isPinned', true);
this.set('pinState.pinId', pin.get('id'));
this.eventBus.publish('pinChange');
this.renderTooltips();
});
return true;

6
gui/app/components/ui/ui-avatar.js
View file

@ -10,10 +10,6 @@
// https://documize.com
import Component from '@ember/component';
import TooltipMixin from '../../mixins/tooltip';
export default Component.extend(TooltipMixin, {
didRender() {
this.renderTooltips();
},
export default Component.extend({
});