cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "feat(router): add reuse support for angular 1.x router""

Browse Source 
This reverts commit cef51a7e0d.
This commit is contained in:
Brian Ford
2015-08-20 13:19:58 -07:00
parent 06487237e5
commit bde6416b40
3 changed files with 89 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/angular1_router/src/ng_outlet.js vendored
View File

@ -134,11 +134,14 @@ function ngOutletDirective($animate, $injector, $q, $router, $componentMapper, $
router.registerOutlet({
commit: function (instruction) {
var next;
var next = $q.when(true);
var componentInstruction = instruction.component;
if (componentInstruction.reuse) {
// todo(shahata): lifecycle - onReuse
next = $q.when(true);
var previousInstruction = currentInstruction;
currentInstruction = componentInstruction;
if (currentController.onReuse) {
next = $q.when(currentController.onReuse(currentInstruction, previousInstruction));
}
} else {
var self = this;
next = this.deactivate(instruction).then(function () {
@ -159,8 +162,9 @@ function ngOutletDirective($animate, $injector, $q, $router, $componentMapper, $
if (!currentInstruction ||
currentInstruction.componentType !== componentInstruction.componentType) {
result = false;
} else if (currentController.canReuse) {
result = currentController.canReuse(componentInstruction, currentInstruction);
} else {
// todo(shahata): lifecycle - canReuse
result = componentInstruction === currentInstruction ||
angular.equals(componentInstruction.params, currentInstruction.params);
}