1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-03 12:35:24 +02:00

fixed sequence bug!

This commit is contained in:
Harvey Kandola 2016-11-10 15:37:16 -08:00
parent c3b13f1626
commit 0fc2889446
4 changed files with 9 additions and 7 deletions

View file

@ -160,6 +160,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
onEntryClick(id) { onEntryClick(id) {
this.setState(id); this.setState(id);
this.attrs.gotoPage(id); this.attrs.gotoPage(id);
}, }
}, }
}); });

View file

@ -46,7 +46,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
return new Ember.RSVP.Promise(function (resolve) { return new Ember.RSVP.Promise(function (resolve) {
self.get('documentService').getPages(documentId).then(function (pages) { self.get('documentService').getPages(documentId).then(function (pages) {
self.set('pages', pages); self.set('allPages', pages);
self.get('sectionService').getAll().then(function (sections) { self.get('sectionService').getAll().then(function (sections) {
self.set('sections', sections.filterBy('pageType', 'section')); self.set('sections', sections.filterBy('pageType', 'section'));
@ -62,8 +62,8 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
controller.set('folders', this.get('folders').rejectBy('id', 0)); controller.set('folders', this.get('folders').rejectBy('id', 0));
controller.set('currentPage', this.pageId); controller.set('currentPage', this.pageId);
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder')); controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
controller.set('pages', this.get('pages').filterBy('pageType', 'section')); controller.set('pages', this.get('allPages').filterBy('pageType', 'section'));
controller.set('tabs', this.get('pages').filterBy('pageType', 'tab')); controller.set('tabs', this.get('allPages').filterBy('pageType', 'tab'));
controller.set('sections', this.get('sections')); controller.set('sections', this.get('sections'));
// setup document owner // setup document owner

View file

@ -7,5 +7,7 @@
{{#layout/zone-content}} {{#layout/zone-content}}
{{document/document-toolbar document=model pages=pages tabs=tabs folder=folder isEditor=isEditor {{document/document-toolbar document=model pages=pages tabs=tabs folder=folder isEditor=isEditor
onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}} {{outlet}} onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}}
{{outlet}}
{{/layout/zone-content}} {{/layout/zone-content}}

View file

@ -203,7 +203,7 @@ function moveDown(state, pages, current) {
} }
} else { } else {
// startingSequence = downTarget.sequence * 2; // startingSequence = downTarget.sequence * 2;
startingSequence = cutOff[cutOff.length - 1].sequence * 2; startingSequence = cutOff[cutOff.length - 1].get('sequence') * 2;
upperSequence = startingSequence * 2; upperSequence = startingSequence * 2;
} }