Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

Scroll to correct point in document for edit mode

Browse source
This commit is contained in:
sauls8t 2018-01-25 13:20:22 +00:00
parent c0d70e38de
commit 412127811e
9 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gui/app/pods/document/index/controller.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import { Promise as EmberPromise } from 'rsvp';
import { schedule } from '@ember/runloop';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import TooltipMixin from '../../../mixins/tooltip';
@ -20,8 +19,9 @@ export default Controller.extend(TooltipMixin, {
templateService: service('template'),
sectionService: service('section'),
linkService: service('link'),
currentPageId: '',
// currentPageId: '',
tab: 'content',
queryParams: ['currentPageId'],
actions: {
onTabChange(tab) {
@ -108,6 +108,8 @@ export default Controller.extend(TooltipMixin, {
pendingChanges.push({ pageId: pages[i].get('page.id'), level: pages[i].get('page.level') - 1 });
}
this.set('currentPageId', null);
if (deleteChildren) {
pendingChanges.push({ pageId: deleteId });
@ -117,7 +119,6 @@ export default Controller.extend(TooltipMixin, {
});
});
} else {
// page delete followed by re-leveling child pages
this.get('documentService').deletePage(documentId, deleteId).then(() => {
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then((pages) => {
this.set('pages', pages);
@ -144,10 +145,8 @@ export default Controller.extend(TooltipMixin, {
this.get('document.slug'),
newPage.id);
} else {
schedule('afterRender', () => {
this.set('currentPageId', newPage.id);
resolve(newPage.id);
});
this.set('currentPageId', newPage.id);
resolve(newPage.id);
}
});
});

5
gui/app/pods/document/index/route.js
View file

@ -57,5 +57,10 @@ export default Route.extend(AuthenticatedRouteMixin, {
controller.set('permissions', model.permissions);
controller.set('roles', model.roles);
controller.set('blocks', model.blocks);
},
activate: function() {
this._super(...arguments);
window.scrollTo(0,0);
}
});

5
gui/app/pods/document/index/template.hbs
View file

@ -38,11 +38,12 @@
{{#if (eq tab 'content')}}
{{document/view-content
document=document links=links pages=pages blocks=blocks
document=document links=links pages=pages blocks=blocks currentPageId=currentPageId
folder=folder folders=folders sections=sections permissions=permissions roles=roles
onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection')
onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock')
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted') refresh=(action 'refresh')}}
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')
refresh=(action 'refresh')}}
{{/if}}
{{#if (eq tab 'attachment')}}

2
gui/app/pods/document/section/controller.js
View file

@ -40,7 +40,7 @@ export default Controller.extend({
this.get('model.folder.slug'),
this.get('model.document.id'),
this.get('model.document.slug'),
{ queryParams: { pageId: page.get('id')}});
{ queryParams: { currentPageId: page.get('id')}});
});
},
}