diff --git a/app/app/components/document/document-sidebar-toc.js b/app/app/components/document/document-sidebar-toc.js index 1483e43e..3d4d6be0 100644 --- a/app/app/components/document/document-sidebar-toc.js +++ b/app/app/components/document/document-sidebar-toc.js @@ -69,7 +69,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { let state = tocUtil.getState(toc, page); if (!this.get('isEditor') || is.empty(pageId)) { - state.actionablePage = state.upDisabled = state.downDisabled = state.indentDisabled = state.outdentDisabled = false; + state.actionablePage = false; + state.upDisabled = state.downDisabled = state.indentDisabled = state.outdentDisabled = true; } this.set('state', state); diff --git a/app/app/components/section/table/type-editor.js b/app/app/components/section/table/type-editor.js index 0c1141a4..c81341e8 100644 --- a/app/app/components/section/table/type-editor.js +++ b/app/app/components/section/table/type-editor.js @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com @@ -25,23 +25,23 @@ export default Ember.Component.extend({ }, didInsertElement() { - let self = this; - $('#table-editor').froalaEditor({ toolbarButtons: [], - height: this.get('editorHeight') - 260, + height: $(document).height() - 400, toolbarInline: true, tableResizerOffset: 10 }); - $('#table-editor').on('froalaEditor.contentChanged', function () { - self.set('isDirty', true); + $('#table-editor').on('froalaEditor.contentChanged', () => { + this.set('isDirty', true); }); }, willDestroyElement() { - $('#table-editor').froalaEditor('destroy'); $('#table-editor').off('froalaEditor.contentChanged'); + // if ($('#table-editor').data('froala.editor')) { + // $('#table-editor').froalaEditor('destroy'); + // } }, actions: { @@ -69,4 +69,4 @@ export default Ember.Component.extend({ this.attrs.onAction(page, meta); } } -}); \ No newline at end of file +}); diff --git a/app/app/components/section/wysiwyg/type-editor.js b/app/app/components/section/wysiwyg/type-editor.js index f96efe13..a55fb2d7 100644 --- a/app/app/components/section/wysiwyg/type-editor.js +++ b/app/app/components/section/wysiwyg/type-editor.js @@ -25,7 +25,7 @@ export default Ember.Component.extend({ }, didInsertElement() { - let maxHeight = $(document).height() - $(".document-editor > .toolbar").height() - 200; + let maxHeight = $(document).height() - 450; let options = { selector: "#rich-text-editor", diff --git a/app/app/pods/document/edit/controller.js b/app/app/pods/document/edit/controller.js index 91a2f2b0..a4712c3b 100644 --- a/app/app/pods/document/edit/controller.js +++ b/app/app/pods/document/edit/controller.js @@ -10,9 +10,8 @@ // https://documize.com import Ember from 'ember'; -import NotifierMixin from '../../../mixins/notifier'; -export default Ember.Controller.extend(NotifierMixin, { +export default Ember.Controller.extend({ documentService: Ember.inject.service('document'), actions: { @@ -26,8 +25,6 @@ export default Ember.Controller.extend(NotifierMixin, { onAction(page, meta) { let self = this; - this.showNotification("Saving"); - let model = { page: page.toJSON({ includeId: true }), meta: meta.toJSON({ includeId: true }) diff --git a/app/app/pods/document/meta/controller.js b/app/app/pods/document/meta/controller.js index 9c7c03e8..e2bc184f 100644 --- a/app/app/pods/document/meta/controller.js +++ b/app/app/pods/document/meta/controller.js @@ -10,15 +10,13 @@ // https://documize.com import Ember from 'ember'; -import NotifierMixin from '../../../mixins/notifier'; -export default Ember.Controller.extend(NotifierMixin, { +export default Ember.Controller.extend({ documentService: Ember.inject.service('document'), actions: { onSave(doc) { this.get('documentService').save(doc).then(() => { - this.showNotification('Saved'); this.transitionToRoute('document.index'); }); } diff --git a/app/app/pods/document/wizard/route.js b/app/app/pods/document/wizard/route.js index 0fe2d0d3..465717f6 100644 --- a/app/app/pods/document/wizard/route.js +++ b/app/app/pods/document/wizard/route.js @@ -6,7 +6,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { folderService: Ember.inject.service('folder'), sectionService: Ember.inject.service('section'), - model(params) { + model() { return Ember.RSVP.hash({ folders: this.modelFor('document').folders, folder: this.modelFor('document').folder, diff --git a/app/app/pods/settings/route.js b/app/app/pods/settings/route.js index 68ae83e6..c5360d92 100644 --- a/app/app/pods/settings/route.js +++ b/app/app/pods/settings/route.js @@ -145,7 +145,6 @@ export default Ember.Route.extend(NotifierMixin, { var payload = { Message: message, Roles: data }; this.get('folderService').savePermissions(folder.get('id'), payload).then(() => { - this.showNotification("Saved"); }); var hasEveryone = _.find(data, function (permission) { diff --git a/app/app/templates/components/section/table/type-editor.hbs b/app/app/templates/components/section/table/type-editor.hbs index fd2f4ac5..cc4b8296 100644 --- a/app/app/templates/components/section/table/type-editor.hbs +++ b/app/app/templates/components/section/table/type-editor.hbs @@ -1,3 +1,3 @@ {{#section/base-editor document=document folder=folder page=page tip="Concise name that describes the table" isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}} - {{focus-textarea value=pageBody id="table-editor" class="mousetrap"}} + {{textarea value=pageBody id="table-editor" class="mousetrap"}} {{/section/base-editor}} diff --git a/app/app/utils/toc.js b/app/app/utils/toc.js index 48da0815..30daa910 100644 --- a/app/app/utils/toc.js +++ b/app/app/utils/toc.js @@ -72,18 +72,6 @@ function getState(toc, page) { if (state.tocTools.indentIncrement === 0) { state.tocTools.indentIncrement = 1; } - - // for (var i2 = index2; i2 >= 0; i2--) { - // if (page.level < toc[i2].level) { - // state.tocTools.allowIndent = false; - // break; - // } - // - // if (page.level === toc[i2].level) { - // state.tocTools.allowIndent = true; - // break; - // } - // } } } diff --git a/core/api/request/page.go b/core/api/request/page.go index ba23f7ae..a000d6c3 100644 --- a/core/api/request/page.go +++ b/core/api/request/page.go @@ -46,7 +46,7 @@ func (p *Persister) AddPage(model models.PageModel) (err error) { err = row.Scan(&maxSeq) if err != nil { - log.Error("unable to select max page.sequence", err) + maxSeq = 2048 } model.Page.Sequence = maxSeq * 2