Index: third_party/pkg/angular/lib/directive/ng_include.dart |
diff --git a/third_party/pkg/angular/lib/directive/ng_include.dart b/third_party/pkg/angular/lib/directive/ng_include.dart |
index f0e35e0782a527e8396b098f0e4e15a2d056add7..a824a125a25c22667dc0713dca3e5a18c6f47889 100644 |
--- a/third_party/pkg/angular/lib/directive/ng_include.dart |
+++ b/third_party/pkg/angular/lib/directive/ng_include.dart |
@@ -5,57 +5,57 @@ part of angular.directive; |
* |
* A new child [Scope] is created for the included DOM subtree. |
* |
- * [NgIncludeDirective] provides only one small part of the power of |
- * [NgComponent]. Consider using directives and components instead as they |
+ * [NgInclude] provides only one small part of the power of |
+ * [Component]. Consider using directives and components instead as they |
* provide this feature as well as much more. |
* |
* Note: The browser's Same Origin Policy (<http://v.gd/5LE5CA>) and |
* Cross-Origin Resource Sharing (CORS) policy (<http://v.gd/nXoY8y>) restrict |
* whether the template is successfully loaded. For example, |
- * [NgIncludeDirective] won't work for cross-domain requests on all browsers and |
+ * [NgInclude] won't work for cross-domain requests on all browsers and |
* for `file://` access on some browsers. |
*/ |
-@NgDirective( |
+@Decorator( |
selector: '[ng-include]', |
map: const {'ng-include': '@url'}) |
-class NgIncludeDirective { |
+class NgInclude { |
final dom.Element element; |
final Scope scope; |
- final BlockCache blockCache; |
+ final ViewCache viewCache; |
final Injector injector; |
final DirectiveMap directives; |
- Block _previousBlock; |
- Scope _previousScope; |
+ View _view; |
+ Scope _scope; |
- NgIncludeDirective(this.element, this.scope, this.blockCache, this.injector, this.directives); |
+ NgInclude(this.element, this.scope, this.viewCache, this.injector, this.directives); |
_cleanUp() { |
- if (_previousBlock == null) return; |
+ if (_view == null) return; |
- _previousBlock.remove(); |
- _previousScope.destroy(); |
+ _view.nodes.forEach((node) => node.remove); |
+ _scope.destroy(); |
element.innerHtml = ''; |
- _previousBlock = null; |
- _previousScope = null; |
+ _view = null; |
+ _scope = null; |
} |
- _updateContent(createBlock) { |
+ _updateContent(createView) { |
// create a new scope |
- _previousScope = scope.createChild(new PrototypeMap(scope.context)); |
- _previousBlock = createBlock(injector.createChild([new Module() |
- ..value(Scope, _previousScope)])); |
+ _scope = scope.createChild(new PrototypeMap(scope.context)); |
+ _view = createView(injector.createChild([new Module() |
+ ..value(Scope, _scope)])); |
- _previousBlock.elements.forEach((elm) => element.append(elm)); |
+ _view.nodes.forEach((node) => element.append(node)); |
} |
set url(value) { |
_cleanUp(); |
if (value != null && value != '') { |
- blockCache.fromUrl(value, directives).then(_updateContent); |
+ viewCache.fromUrl(value, directives).then(_updateContent); |
} |
} |
} |