mirror of
https://github.com/documize/community.git
synced 2025-07-24 15:49:44 +02:00
Replaced underscore.js & is.js with lodash.js
This commit is contained in:
parent
df8e843bf5
commit
566807bc14
93 changed files with 17379 additions and 2056 deletions
|
@ -67,7 +67,7 @@ export default Component.extend(Notifier, Modals, {
|
|||
}
|
||||
|
||||
// But, if we can work work correct placement, we put new content as best we can.
|
||||
if (is.object(beforePage)) {
|
||||
if (_.isObject(beforePage)) {
|
||||
level = beforePage.get('level');
|
||||
|
||||
// get any page before the beforePage so we can insert this new section between them
|
||||
|
@ -76,7 +76,7 @@ export default Component.extend(Notifier, Modals, {
|
|||
if (index !== -1) {
|
||||
let beforeBeforePage = this.get('pages')[index-1];
|
||||
|
||||
if (is.not.undefined(beforeBeforePage)) {
|
||||
if (!_.isUndefined(beforeBeforePage)) {
|
||||
sequence = (beforePage.get('sequence') + beforeBeforePage.get('page.sequence')) / 2;
|
||||
} else {
|
||||
sequence = beforePage.get('sequence') / 2;
|
||||
|
@ -97,7 +97,7 @@ export default Component.extend(Notifier, Modals, {
|
|||
actions: {
|
||||
onInsertSection(section) {
|
||||
let sectionName = this.get('newSectionName');
|
||||
if (is.empty(sectionName)) {
|
||||
if (_.isEmpty(sectionName)) {
|
||||
$("#new-section-name").focus();
|
||||
return;
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ export default Component.extend(Notifier, Modals, {
|
|||
|
||||
onInsertBlock(block) {
|
||||
let sectionName = this.get('newSectionName');
|
||||
if (is.empty(sectionName)) {
|
||||
if (_.isEmpty(sectionName)) {
|
||||
$("#new-section-name").focus();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -62,8 +62,8 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
this.get('link').getCandidates(folderId, documentId, pageId).then(function (candidates) {
|
||||
self.set('candidates', candidates);
|
||||
self.set('hasSections', is.not.null(candidates.pages) && candidates.pages.length);
|
||||
self.set('hasAttachments', is.not.null(candidates.attachments) && candidates.attachments.length);
|
||||
self.set('hasSections', !_.isNull(candidates.pages) && candidates.pages.length);
|
||||
self.set('hasAttachments', !_.isNull(candidates.attachments) && candidates.attachments.length);
|
||||
|
||||
if (!self.get('hasSections') && !self.get('hasAttachments')) {
|
||||
self.set('tab1Selected', false);
|
||||
|
@ -148,7 +148,7 @@ export default Component.extend(ModalMixin, {
|
|||
}
|
||||
}
|
||||
|
||||
if (is.null(selection)) {
|
||||
if (_.isNull(selection)) {
|
||||
if (this.get('tab4Selected')) this.$('#content-linker-networklocation').addClass('is-invalid').focus();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ export default Component.extend({
|
|||
onDeletePage(deleteChildren) {
|
||||
let page = this.get('page');
|
||||
|
||||
if (is.undefined(page)) {
|
||||
if (_.isUndefined(page)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -57,6 +57,7 @@ export default Component.extend(ModalMixin, AuthMixin, Notifier, {
|
|||
pinId: '',
|
||||
newName: ''
|
||||
};
|
||||
|
||||
this.saveTemplate = {
|
||||
name: '',
|
||||
description: ''
|
||||
|
@ -130,12 +131,12 @@ export default Component.extend(ModalMixin, AuthMixin, Notifier, {
|
|||
let name = this.get('saveTemplate.name');
|
||||
let excerpt = this.get('saveTemplate.description');
|
||||
|
||||
if (is.empty(name)) {
|
||||
if (_.isEmpty(name)) {
|
||||
$("#new-template-name").addClass("is-invalid").focus();
|
||||
return;
|
||||
}
|
||||
|
||||
if (is.empty(excerpt)) {
|
||||
if (_.isEmpty(excerpt)) {
|
||||
$("#new-template-desc").addClass("is-invalid").focus();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -127,7 +127,7 @@ export default Component.extend(ModalMixin, {
|
|||
let page = this.get('page');
|
||||
let titleElem = '#block-title-' + page.get('id');
|
||||
let blockTitle = this.get('blockTitle');
|
||||
if (is.empty(blockTitle)) {
|
||||
if (_.isEmpty(blockTitle)) {
|
||||
$(titleElem).addClass('is-invalid');
|
||||
return;
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ export default Component.extend(ModalMixin, {
|
|||
let excerptElem = '#block-desc-' + page.get('id');
|
||||
let blockExcerpt = this.get('blockExcerpt');
|
||||
blockExcerpt = blockExcerpt.replace(/\n/g, "");
|
||||
if (is.empty(blockExcerpt)) {
|
||||
if (_.isEmpty(blockExcerpt)) {
|
||||
$(excerptElem).addClass('is-invalid');
|
||||
return;
|
||||
}
|
||||
|
@ -178,9 +178,9 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
onCopyPage() {
|
||||
let item = this.get('docSearchResults').findBy('selected', true);
|
||||
let documentId = is.not.undefined(item) ? item.get('documentId') : '';
|
||||
let documentId = !_.isUndefined(item) ? item.get('documentId') : '';
|
||||
|
||||
if (is.empty(documentId)) return;
|
||||
if (_.isEmpty(documentId)) return;
|
||||
|
||||
this.modalClose('#copy-page-modal-' + this.get('page.id'));
|
||||
|
||||
|
@ -193,9 +193,9 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
onMovePage() {
|
||||
let item = this.get('docSearchResults').findBy('selected', true);
|
||||
let documentId = is.not.undefined(item) ? item.get('documentId') : '';
|
||||
let documentId = !_.isUndefined(item) ? item.get('documentId') : '';
|
||||
|
||||
if (is.empty(documentId)) return;
|
||||
if (_.isEmpty(documentId)) return;
|
||||
|
||||
// can't move into self
|
||||
if (documentId === this.get('document.id')) return;
|
||||
|
@ -219,7 +219,7 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.moveUp(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -235,7 +235,7 @@ export default Component.extend(ModalMixin, {
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.moveDown(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -251,7 +251,7 @@ export default Component.extend(ModalMixin, {
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.indent(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -267,7 +267,7 @@ export default Component.extend(ModalMixin, {
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.outdent(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
|
|
@ -92,7 +92,7 @@ export default Component.extend(Notifier, {
|
|||
this.set('selectedCategories', selected);
|
||||
selected.forEach((s) => {
|
||||
let cat = cats.findBy('id', s.id);
|
||||
if (is.not.undefined(cat)) {
|
||||
if (!_.isUndefined(cat)) {
|
||||
cat.set('selected', true);
|
||||
this.set('categories', cats);
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ export default Component.extend(Notifier, {
|
|||
_.each(tagz, (t) => {
|
||||
let tag = t.value.toLowerCase().trim();
|
||||
if (tag.length> 0) {
|
||||
if (!_.contains(tagzToSave, tag) && is.not.startWith(tag, '-')) {
|
||||
if (!_.includes(tagzToSave, tag) && !_.startsWith(tag, '-')) {
|
||||
tagzToSave.push(tag);
|
||||
this.$('#add-tag-field-' + t.number).removeClass('is-invalid');
|
||||
} else {
|
||||
|
|
|
@ -92,7 +92,7 @@ export default Component.extend(Notifier, {
|
|||
this.set('selectedCategories', selected);
|
||||
selected.forEach((s) => {
|
||||
let cat = cats.findBy('id', s.id);
|
||||
if (is.not.undefined(cat)) {
|
||||
if (!_.isUndefined(cat)) {
|
||||
cat.set('selected', true);
|
||||
this.set('categories', cats);
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ export default Component.extend(Notifier, {
|
|||
_.each(tagz, (t) => {
|
||||
let tag = t.value.toLowerCase().trim();
|
||||
if (tag.length> 0) {
|
||||
if (!_.contains(tagzToSave, tag) && is.not.startWith(tag, '-')) {
|
||||
if (!_.includes(tagzToSave, tag) && !_.startsWith(tag, '-')) {
|
||||
tagzToSave.push(tag);
|
||||
this.$('#add-tag-field-' + t.number).removeClass('is-invalid');
|
||||
} else {
|
||||
|
|
|
@ -48,7 +48,7 @@ export default Component.extend({
|
|||
didReceiveAttrs() {
|
||||
this._super(...arguments);
|
||||
let cp = this.get('currentPageId');
|
||||
this.setState(is.empty(cp) ? '' : cp);
|
||||
this.setState(_.isEmpty(cp) ? '' : cp);
|
||||
},
|
||||
|
||||
didInsertElement() {
|
||||
|
@ -71,7 +71,7 @@ export default Component.extend({
|
|||
setState(pageId) {
|
||||
let toc = this.get('pages');
|
||||
let page = _.find(toc, function(i) { return i.get('page.id') === pageId; });
|
||||
let state = tocUtil.getState(toc, is.not.undefined(page) ? page.get('page') : page);
|
||||
let state = tocUtil.getState(toc, !_.isUndefined(page) ? page.get('page') : page);
|
||||
|
||||
if (!this.get('canEdit')) {
|
||||
state.actionablePage = false;
|
||||
|
@ -92,7 +92,7 @@ export default Component.extend({
|
|||
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.moveUp(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -108,7 +108,7 @@ export default Component.extend({
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.moveDown(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -124,7 +124,7 @@ export default Component.extend({
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.indent(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
@ -140,7 +140,7 @@ export default Component.extend({
|
|||
let state = this.get('state');
|
||||
let pages = this.get('pages');
|
||||
let page = _.find(pages, function(i) { return i.get('page.id') === state.pageId; });
|
||||
if (is.not.undefined(page)) page = page.get('page');
|
||||
if (!_.isUndefined(page)) page = page.get('page');
|
||||
|
||||
let pendingChanges = tocUtil.outdent(state, pages, page);
|
||||
if (pendingChanges.length > 0) {
|
||||
|
|
|
@ -90,7 +90,7 @@ export default Component.extend(Notifier, {
|
|||
},
|
||||
|
||||
jumpToSection(cp) {
|
||||
if (is.not.empty(cp) && is.not.undefined(cp) && is.not.null(cp)) {
|
||||
if (!_.isEmpty(cp) && !_.isUndefined(cp) && !_.isNull(cp)) {
|
||||
this.get('browser').scrollTo(`#page-${cp}`)
|
||||
}
|
||||
},
|
||||
|
|
|
@ -35,7 +35,7 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
let revision = this.get('revision');
|
||||
|
||||
if (is.not.null(revision)) {
|
||||
if (!_.isNull(revision)) {
|
||||
if (!revision.deleted) {
|
||||
this.fetchDiff(revision.pageId, revision.id);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue