diff --git a/modules/angular1_router/build.js b/modules/angular1_router/build.js
index cacaf86320..62c790ec7c 100644
--- a/modules/angular1_router/build.js
+++ b/modules/angular1_router/build.js
@@ -1,5 +1,3 @@
-'use strict';
-
var fs = require('fs');
var ts = require('typescript');
@@ -60,10 +58,6 @@ function main() {
"});",
"}));",
"}",
- "if (constructor.$routeConfig) {",
- "constructor.annotations = constructor.annotations || [];",
- "constructor.annotations.push(new angular.annotations.RouteConfig(constructor.$routeConfig));",
- "}",
"if (constructor.annotations) {",
"constructor.annotations.forEach(function(annotation) {",
"if (annotation instanceof RouteConfig) {",
@@ -76,11 +70,7 @@ function main() {
"});",
"var router = new RootRouter(registry, undefined, location, new Object());",
- "$rootScope.$watch(function () { return $location.path(); }, function (path) {",
- "if (router.lastNavigationAttempt !== path) {",
- "router.navigate(path);",
- "}",
- "});",
+ "$rootScope.$watch(function () { return $location.path(); }, function (path) { router.navigate(path); });",
"return router;"
].join('\n'));
diff --git a/modules/angular1_router/src/ng_outlet.js b/modules/angular1_router/src/ng_outlet.js
index 3d170d5952..7598c8a9ee 100644
--- a/modules/angular1_router/src/ng_outlet.js
+++ b/modules/angular1_router/src/ng_outlet.js
@@ -134,14 +134,11 @@ function ngOutletDirective($animate, $injector, $q, $router, $componentMapper, $
router.registerOutlet({
commit: function (instruction) {
- var next = $q.when(true);
+ var next;
var componentInstruction = instruction.component;
if (componentInstruction.reuse) {
- var previousInstruction = currentInstruction;
- currentInstruction = componentInstruction;
- if (currentController.onReuse) {
- next = $q.when(currentController.onReuse(currentInstruction, previousInstruction));
- }
+ // todo(shahata): lifecycle - onReuse
+ next = $q.when(true);
} else {
var self = this;
next = this.deactivate(instruction).then(function () {
@@ -162,9 +159,8 @@ 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);
}
diff --git a/modules/angular1_router/test/ng_outlet_spec.js b/modules/angular1_router/test/ng_outlet_spec.js
index ac9c977683..cd89ffc005 100644
--- a/modules/angular1_router/test/ng_outlet_spec.js
+++ b/modules/angular1_router/test/ng_outlet_spec.js
@@ -358,76 +358,6 @@ describe('ngOutlet', function () {
});
- it('should reuse a component when the canReuse hook returns true', function () {
- var log = [];
- var cmpInstanceCount = 0;
-
- function ReuseCmp() {
- cmpInstanceCount++;
- this.canReuse = function () {
- return true;
- };
- this.onReuse = function (next, prev) {
- log.push('reuse: ' + prev.urlPath + ' -> ' + next.urlPath);
- };
- }
- ReuseCmp.$routeConfig = [{path: '/a', component: OneController}, {path: '/b', component: TwoController}];
- registerComponent('reuse', 'reuse {