vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix file modal routing

Browse Source
This commit is contained in:
Benjamin Gamard 2017-11-12 02:18:02 +01:00
parent 517e4a4507
commit 46079393d5
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
View File

@ -3,7 +3,7 @@
/** /**
* File view controller. * File view controller.
*/ */
angular.module('docs').controller('FileView', function($uibModal, $state, $stateParams) { angular.module('docs').controller('FileView', function($uibModal, $state, $stateParams, $timeout) {
var modal = $uibModal.open({ var modal = $uibModal.open({
windowClass: 'modal modal-fileview', windowClass: 'modal modal-fileview',
templateUrl: 'partial/docs/file.view.html', templateUrl: 'partial/docs/file.view.html',
@ -17,6 +17,12 @@ angular.module('docs').controller('FileView', function($uibModal, $state, $state
modal.closed = true; modal.closed = true;
}, function() { }, function() {
modal.closed = true; modal.closed = true;
$state.go('^', { id: $stateParams.id }); $timeout(function () {
// After all router transitions are passed,
// if we are still on the file route, go back to the document
if ($state.current.name === 'document.view.content.file') {
$state.go('^', {id: $stateParams.id});
}
});
}); });
}); });

10
docs-web/src/main/webapp/src/app/share/controller/FileView.js
View File

@ -3,7 +3,7 @@
/** /**
* File view controller. * File view controller.
*/ */
angular.module('share').controller('FileView', function($uibModal, $state, $stateParams) { angular.module('share').controller('FileView', function($uibModal, $state, $stateParams, $timeout) {
var modal = $uibModal.open({ var modal = $uibModal.open({
windowClass: 'modal modal-fileview', windowClass: 'modal modal-fileview',
templateUrl: 'partial/share/file.view.html', templateUrl: 'partial/share/file.view.html',
@ -17,6 +17,12 @@ angular.module('share').controller('FileView', function($uibModal, $state, $stat
modal.closed = true; modal.closed = true;
},function() { },function() {
modal.closed = true; modal.closed = true;
$state.go('share', { documentId: $stateParams.documentId, shareId: $stateParams.shareId }); $timeout(function () {
// After all router transitions are passed,
// if we are still on the file route, go back to the share
if ($state.current.name === 'share.file') {
$state.go('share', { documentId: $stateParams.documentId, shareId: $stateParams.shareId });
}
});
}); });
}); });