aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Minar2011-01-19 00:10:39 -0800
committerMisko Hevery2011-01-19 15:52:27 -0800
commita5eb3ed107034cce5b7de3ec3f8a43ff3a379fa1 (patch)
tree791c8ac9c0f235dd6afe71f951518b9bf41f8bcd /src
parent63690d189214135f22171ad8795ccfe15103a8e6 (diff)
downloadangular.js-a5eb3ed107034cce5b7de3ec3f8a43ff3a379fa1.tar.bz2
$route should create child scope via $new
Diffstat (limited to 'src')
-rw-r--r--src/services.js2
-rw-r--r--src/widgets.js11
2 files changed, 1 insertions, 12 deletions
diff --git a/src/services.js b/src/services.js
index 0801ee9c..3543b2ea 100644
--- a/src/services.js
+++ b/src/services.js
@@ -708,7 +708,7 @@ angularServiceInject('$route', function(location) {
if (!childScope) {
var pathParams = matcher(location.hashPath, route);
if (pathParams) {
- childScope = createScope(parentScope);
+ childScope = parentScope.$new();
$route.current = extend({}, routeParams, {
scope: childScope,
params: extend({}, location.hashSearch, pathParams)
diff --git a/src/widgets.js b/src/widgets.js
index c1cb0c7b..3b0ffab7 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -625,20 +625,9 @@ angularWidget('ng:include', function(element){
return extend(function(xhr, element){
var scope = this, childScope;
var changeCounter = 0;
- var preventRecursion = false;
function incrementChange(){ changeCounter++;}
this.$watch(srcExp, incrementChange);
this.$watch(scopeExp, incrementChange);
- scope.$onEval(function(){
- if (childScope && !preventRecursion) {
- preventRecursion = true;
- try {
- childScope.$eval();
- } finally {
- preventRecursion = false;
- }
- }
- });
this.$watch(function(){return changeCounter;}, function(){
var src = this.$eval(srcExp),
useScope = this.$eval(scopeExp);