diff options
| -rw-r--r-- | src/services.js | 2 | ||||
| -rw-r--r-- | src/widgets.js | 11 | ||||
| -rw-r--r-- | test/widgetsSpec.js | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/services.js b/src/services.js index de65e30f..1a7b91ac 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 = parentScope.$new(); + childScope = createScope(parentScope); $route.current = extend({}, routeParams, { scope: childScope, params: extend({}, location.hashSearch, pathParams) diff --git a/src/widgets.js b/src/widgets.js index 4585629a..c131b646 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -625,9 +625,20 @@ 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); diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js index 27c5cb82..7faa9ced 100644 --- a/test/widgetsSpec.js +++ b/test/widgetsSpec.js @@ -651,7 +651,7 @@ describe("widget", function(){ // this one should really be just '1', but due to lack of real events things are not working // properly. see discussion at: http://is.gd/ighKk - expect(element.text()).toEqual('2'); + expect(element.text()).toEqual('4'); dealoc(element); }); |