Revert "preview files child route (#170)" (#171)

This reverts commit d768219bdb.
This commit is contained in:
Denys Vuika
2018-01-03 10:05:54 +00:00
committed by GitHub
parent d768219bdb
commit b6018facac
13 changed files with 42 additions and 115 deletions

View File

@@ -80,10 +80,9 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
if (node.isFolder) {
this.updateCurrentNode(node);
} else {
this.router.navigate(['/personal-files', node.parentId], { replaceUrl: true });
this.router.navigate(['/personal-files', node.parentId]);
}
})
.skipWhile(node => !node.isFolder)
.flatMap((node) => this.fetchNodes(node.id))
.subscribe(
(page) => {
@@ -155,7 +154,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
event.preventDefault();
} else if (node.isFile) {
this.router.navigate(['./preview', node.id], { relativeTo: this.route });
this.router.navigate(['/preview', node.id]);
}
}
@@ -165,7 +164,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
showPreview(node: MinimalNodeEntryEntity) {
if (node) {
if (node.isFile) {
this.router.navigate(['./preview', node.id], { relativeTo: this.route });
this.router.navigate(['/preview', node.id]);
}
}
}