1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-09 15:35:27 +02:00

misc. fixes

This commit is contained in:
Harvey Kandola 2016-06-24 14:21:46 -07:00
parent e03bb4d6ee
commit 48a60f0fcd
4 changed files with 12 additions and 10 deletions

View file

@ -67,6 +67,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
willDestroyElement() { willDestroyElement() {
this.eventBus.unsubscribe('documentPageAdded'); this.eventBus.unsubscribe('documentPageAdded');
this.destroyTooltips();
}, },
onDocumentPageAdded(pageId) { onDocumentPageAdded(pageId) {
@ -409,4 +410,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
this.attrs.gotoPage(id); this.attrs.gotoPage(id);
}, },
}, },
}); });

View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved. // Copyright 2016 Documize Inc. <legal@documize.com>. 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 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
// //
// You can operate outside the AGPL restrictions by purchasing // You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license // Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>. // by contacting <sales@documize.com>.
// //
// https://documize.com // https://documize.com
@ -22,6 +22,10 @@ export default Ember.Component.extend(TooltipMixin, {
} }
}, },
willDestroyElement() {
this.destroyTooltips();
},
actions: { actions: {
editPage(id) { editPage(id) {
this.attrs.onEditPage(id); this.attrs.onEditPage(id);
@ -31,4 +35,4 @@ export default Ember.Component.extend(TooltipMixin, {
this.attrs.onDeletePage(id); this.attrs.onDeletePage(id);
}, },
} }
}); });

View file

@ -197,7 +197,6 @@ export default Ember.Controller.extend(NotifierMixin, {
}, },
onDocumentDelete() { onDocumentDelete() {
console.log("deleting " + this.get('model.id'));
let self = this; let self = this;
this.get('documentService').deleteDocument(this.get('model.id')).then(function() { this.get('documentService').deleteDocument(this.get('model.id')).then(function() {

View file

@ -7,11 +7,9 @@
<i class="material-icons">mode_edit</i> <i class="material-icons">mode_edit</i>
</div> </div>
{{/link-to}} {{/link-to}}
{{#unless page.firstPage}} <div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}>
<div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}> <i class="material-icons">delete</i>
<i class="material-icons">delete</i> </div>
</div>
{{/unless}}
{{/if}} {{/if}}
</div> </div>
</div> </div>