MERGE: scope

mhevery · mhevery · commit bb27c91d3194 · 2011-05-27T15:22:02.000-07:00
diff --git a/src/service/route.js b/src/service/route.js
@@ -201,31 +201,32 @@ angularServiceInject('$route', function($location, $updateView) {
 
 
   function updateRoute(){
-    var childScope, routeParams, pathParams, segmentMatch, key, redir;
+    var selectedRoute, pathParams, segmentMatch, key, redir;
 
-    if ($route.current) {
+    if ($route.current && $route.current.scope) {
       $route.current.scope.$destroy();
     }
     $route.current = null;
+    // Match a route
     forEach(routes, function(rParams, rPath) {
       if (!pathParams) {
         if (pathParams = matcher($location.hashPath, rPath)) {
-          routeParams = rParams;
+          selectedRoute = rParams;
         }
       }
     });
 
-    // "otherwise" fallback
-    routeParams = routeParams || routes[null];
+    // No route matched; fallback to "otherwise" route
+    selectedRoute = selectedRoute || routes[null];
 
-    if(routeParams) {
-      if (routeParams.redirectTo) {
-        if (isString(routeParams.redirectTo)) {
+    if(selectedRoute) {
+      if (selectedRoute.redirectTo) {
+        if (isString(selectedRoute.redirectTo)) {
           // interpolate the redirectTo string
           redir = {hashPath: '',
                    hashSearch: extend({}, $location.hashSearch, pathParams)};
 
-          forEach(routeParams.redirectTo.split(':'), function(segment, i) {
+          forEach(selectedRoute.redirectTo.split(':'), function(segment, i) {
             if (i==0) {
               redir.hashPath += segment;
             } else {
@@ -238,23 +239,25 @@ angularServiceInject('$route', function($location, $updateView) {
           });
         } else {
           // call custom redirectTo function
-          redir = {hash: routeParams.redirectTo(pathParams, $location.hash, $location.hashPath,
+          redir = {hash: selectedRoute.redirectTo(pathParams, $location.hash, $location.hashPath,
                                                 $location.hashSearch)};
         }
 
         $location.update(redir);
         return;
       }
 
-      childScope = parentScope.$new(routeParams.controller);
-      $route.current = extend({}, routeParams, {
-        scope: childScope,
-        params: extend({}, $location.hashSearch, pathParams)
-      });
+      $route.current = extend({}, selectedRoute);
+      $route.current.params = extend({}, $location.hashSearch, pathParams);
     }
 
     //fire onChange callbacks
     forEach(onChange, parentScope.$eval, parentScope);
+
+    // Create the scope if we have mtched a route
+    if ($route.current) {
+      $route.current.scope = parentScope.$new($route.current.controller);
+    }
   }
 
 
diff --git a/src/widgets.js b/src/widgets.js
@@ -1228,27 +1228,21 @@ angularWidget('ng:view', function(element) {
   if (!element[0]['ng:compiled']) {
     element[0]['ng:compiled'] = true;
     return annotate('$xhr.cache', '$route', function($xhr, $route, element){
-      var childScope;
-      var src;
+      var template;
       var changeCounter = 0;
 
       $route.onChange(function(){
-        if ($route.current) {
-          src = $route.current.template;
-          childScope = $route.current.scope;
-        } else {
-          src = childScope = null;
-        }
         changeCounter++;
       })(); //initialize the state forcefully, it's possible that we missed the initial
             //$route#onChange already
 
       this.$observe(function(){return changeCounter;}, function(){
-        if (src) {
+        var template = $route.current && $route.current.template;
+        if (template) {
           //xhr's callback must be async, see commit history for more info
-          $xhr('GET', src, function(code, response){
+          $xhr('GET', template, function(code, response){
             element.html(response);
-            compiler.compile(element)(childScope);
+            compiler.compile(element)($route.current.scope);
           });
         } else {
           element.html('');
diff --git a/test/service/routeSpec.js b/test/service/routeSpec.js
@@ -16,7 +16,7 @@ describe('$route', function() {
         $location, $route;
 
     function BookChapter() {
-      this.log = '<init>';
+      log += '<init>';
     }
     scope = compile('<div></div>')();
     $location = scope.$service('$location');
@@ -26,11 +26,11 @@ describe('$route', function() {
     $route.onChange(function(){
       log += 'onChange();';
     });
+
     $location.update('http://server#/Book/Moby/Chapter/Intro?p=123');
     scope.$digest();
-    expect(log).toEqual('onChange();');
+    expect(log).toEqual('onChange();<init>');
     expect($route.current.params).toEqual({book:'Moby', chapter:'Intro', p:'123'});
-    expect($route.current.scope.log).toEqual('<init>');
     var lastId = $route.current.scope.$id;
 
     log = '';
