aboutsummaryrefslogtreecommitdiffstats
path: root/src/widgets.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets.js')
-rw-r--r--src/widgets.js22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/widgets.js b/src/widgets.js
index c131b646..f90b29a9 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -629,6 +629,9 @@ angularWidget('ng:include', function(element){
function incrementChange(){ changeCounter++;}
this.$watch(srcExp, incrementChange);
this.$watch(scopeExp, incrementChange);
+
+ // note that this propagates eval to the current childScope, where childScope is dynamically
+ // bound (via $route.onChange callback) to the current scope created by $route
scope.$onEval(function(){
if (childScope && !preventRecursion) {
preventRecursion = true;
@@ -1009,24 +1012,35 @@ angularWidget('ng:view', function(element) {
if (!element[0]['ng:compiled']) {
element[0]['ng:compiled'] = true;
return injectService(['$xhr.cache', '$route'], function($xhr, $route, element){
+ var parentScope = this,
+ childScope;
+
$route.onChange(function(){
- var src, scope;
+ var src;
if ($route.current) {
src = $route.current.template;
- scope = $route.current.scope;
+ childScope = $route.current.scope;
}
if (src) {
$xhr('GET', src, function(code, response){
element.html(response);
- compiler.compile(element)(element, scope);
- scope.$init();
+ compiler.compile(element)(element, childScope);
+ childScope.$init();
});
} else {
element.html('');
}
});
+
+ // note that this propagates eval to the current childScope, where childScope is dynamically
+ // bound (via $route.onChange callback) to the current scope created by $route
+ parentScope.$onEval(function() {
+ if (childScope) {
+ childScope.$eval();
+ }
+ });
});
} else {
this.descend(true);