fix(html_adapter): Implement hasAttribute and getAttribute.

jakemac53 · jakemac53 · commit e988f59c0804 · 2015-07-14T14:48:00.000-07:00
Fixes the template compiler when running on the server.
diff --git a/modules/angular2/src/dom/html_adapter.dart b/modules/angular2/src/dom/html_adapter.dart
@@ -13,7 +13,7 @@ class Html5LibDomAdapter implements DomAdapter {
   hasProperty(element, String name) {
     // This is needed for serverside compile to generate the right getters/setters.
     // TODO: change this once we have property schema support.
-    // Attention: Keep this in sync with browser_adapter.dart! 
+    // Attention: Keep this in sync with browser_adapter.dart!
     return true;
   }
 
@@ -235,10 +235,14 @@ class Html5LibDomAdapter implements DomAdapter {
     return map;
   }
   hasAttribute(element, String attribute) {
-    throw 'not implemented';
+    // `attributes` keys can be {@link AttributeName}s.
+    return element.attributes.keys.any((key) => '$key' == attribute);
   }
   getAttribute(element, String attribute) {
-    throw 'not implemented';
+    // `attributes` keys can be {@link AttributeName}s.
+    var key = element.attributes.keys.firstWhere(
+        (key) => '$key' == attribute, orElse: () {});
+    return element.attributes[key];
   }
   setAttribute(element, String name, String value) {
     element.attributes[name] = value;
diff --git a/modules/angular2/test/dom/html5lib_adapter.server.spec.dart b/modules/angular2/test/dom/html5lib_adapter.server.spec.dart
@@ -16,5 +16,19 @@ main() {
     it('should parse HTML', () {
       expect(subject.parse('<div>hi</div>'), isNotNull);
     });
+
+    it('implements hasAttribute', () {
+      var div = subject.querySelector(
+          subject.parse('<div foo="bar"></div>'), ('div'));
+      expect(subject.hasAttribute(div, 'foo')).toBeTrue();
+      expect(subject.hasAttribute(div, 'bar')).toBeFalse();
+    });
+
+    it('implements getAttribute', () {
+      var div = subject.querySelector(
+          subject.parse('<div foo="bar"></div>'), ('div'));
+      expect(subject.getAttribute(div, 'foo')).toEqual('bar');
+      expect(subject.getAttribute(div, 'bar')).toBe(null);
+    });
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Html5LibDomAdapter implements DomAdapter {`
`13`	`13`	`hasProperty(element, String name) {`
`14`	`14`	`// This is needed for serverside compile to generate the right getters/setters.`
`15`	`15`	`// TODO: change this once we have property schema support.`
`16`		`- // Attention: Keep this in sync with browser_adapter.dart!`
	`16`	`+ // Attention: Keep this in sync with browser_adapter.dart!`
`17`	`17`	`return true;`
`18`	`18`	`}`
`19`	`19`
`@@ -235,10 +235,14 @@ class Html5LibDomAdapter implements DomAdapter {`
`235`	`235`	`return map;`
`236`	`236`	`}`
`237`	`237`	`hasAttribute(element, String attribute) {`
`238`		`- throw 'not implemented';`
	`238`	+ // `attributes` keys can be {@link AttributeName}s.
	`239`	`+ return element.attributes.keys.any((key) => '$key' == attribute);`
`239`	`240`	`}`
`240`	`241`	`getAttribute(element, String attribute) {`
`241`		`- throw 'not implemented';`
	`242`	+ // `attributes` keys can be {@link AttributeName}s.
	`243`	`+ var key = element.attributes.keys.firstWhere(`
	`244`	`+ (key) => '$key' == attribute, orElse: () {});`
	`245`	`+ return element.attributes[key];`
`242`	`246`	`}`
`243`	`247`	`setAttribute(element, String name, String value) {`
`244`	`248`	`element.attributes[name] = value;`