Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-04-10 01:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

angular internals should not call methods via angular namespace

Browse source
This commit is contained in:
Igor Minar 2011-01-19 00:04:05 -08:00 committed by Misko Hevery
parent 050e5d773f
commit 63690d1892
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/services.js
View file

@ -693,10 +693,10 @@ angularServiceInject('$route', function(location) {
* Add new route
*/
when:function (path, params) {
if (angular.isUndefined(path)) return routes;
if (isUndefined(path)) return routes;
var route = routes[path];
if (!route) route = routes[path] = {};
if (params) angular.extend(route, params);
if (params) extend(route, params);
dirty++;
return route;
}
@ -704,19 +704,19 @@ angularServiceInject('$route', function(location) {
function updateRoute(){
var childScope;
$route.current = _null;
angular.forEach(routes, function(routeParams, route) {
forEach(routes, function(routeParams, route) {
if (!childScope) {
var pathParams = matcher(location.hashPath, route);
if (pathParams) {
childScope = angular.scope(parentScope);
$route.current = angular.extend({}, routeParams, {
childScope = createScope(parentScope);
$route.current = extend({}, routeParams, {
scope: childScope,
params: angular.extend({}, location.hashSearch, pathParams)
params: extend({}, location.hashSearch, pathParams)
});
}
}
});
angular.forEach(onChange, parentScope.$tryEval);
forEach(onChange, parentScope.$tryEval);
if (childScope) {
childScope.$become($route.current.controller);
}