chore(refactor): easier to make sense of attr-to-prop map (even if a bit reduntant)

yjbanov · yjbanov · commit cbe7b8c6717f · 2015-02-27T22:11:08.000-08:00
diff --git a/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js b/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js
@@ -91,26 +91,12 @@ function roleSetter(element, value) {
   }
 }
 
-// special mapping for cases where attribute name doesn't match property name
-var _lazyAttrToProp;
-
-function attrToProp() {
-  if (!isPresent(_lazyAttrToProp)) {
-    _lazyAttrToProp = StringMapWrapper.merge({
-      "inner-html": "innerHTML",
-      "readonly": "readOnly",
-      "tabindex": "tabIndex",
-    }, DOM.attrToPropMap);
-  }
-  return _lazyAttrToProp;
-}
-
 // tells if an attribute is handled by the ElementBinderBuilder step
 export function isSpecialProperty(propName:string) {
   return StringWrapper.startsWith(propName, ARIA_PREFIX)
         || StringWrapper.startsWith(propName, CLASS_PREFIX)
         || StringWrapper.startsWith(propName, STYLE_PREFIX)
-        || StringMapWrapper.contains(attrToProp(), propName);
+        || StringMapWrapper.contains(DOM.attrToPropMap, propName);
 }
 
 /**
@@ -257,7 +243,7 @@ export class ElementBinderBuilder extends CompileStep {
   }
 
   _resolvePropertyName(attrName:string) {
-    var mappedPropName = StringMapWrapper.get(attrToProp(), attrName);
+    var mappedPropName = StringMapWrapper.get(DOM.attrToPropMap, attrName);
     return isPresent(mappedPropName) ? mappedPropName : attrName;
   }
 }
diff --git a/modules/angular2/src/dom/browser_adapter.dart b/modules/angular2/src/dom/browser_adapter.dart
@@ -18,10 +18,11 @@ class BrowserDomAdapter extends DomAdapter {
     setRootDomAdapter(new BrowserDomAdapter());
   }
 
-  // override JS logic of attribute to property mapping
   @override
   final attrToPropMap = const {
-    "inner-html": "innerHtml"
+    'inner-html': 'innerHtml',
+    'readonly': 'readOnly',
+    'tabindex': 'tabIndex',
   };
 
   query(String selector) => document.querySelector(selector);
@@ -108,13 +109,13 @@ class BrowserDomAdapter extends DomAdapter {
   createScriptTag(String attrName, String attrValue,
       [HtmlDocument doc = null]) {
     if (doc == null) doc = document;
-    var el = doc.createElement("SCRIPT");
+    var el = doc.createElement('SCRIPT');
     el.setAttribute(attrName, attrValue);
     return el;
   }
   StyleElement createStyleElement(String css, [HtmlDocument doc = null]) {
     if (doc == null) doc = document;
-    var el = doc.createElement("STYLE");
+    var el = doc.createElement('STYLE');
     el.text = css;
     return el;
   }
diff --git a/modules/angular2/src/dom/browser_adapter.es6 b/modules/angular2/src/dom/browser_adapter.es6
@@ -2,15 +2,19 @@ import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {isPresent} from 'angular2/src/facade/lang';
 import {DomAdapter, setRootDomAdapter} from './dom_adapter';
 
-var EMPTY_MAP = MapWrapper.create();
+var _attrToPropMap = {
+  'inner-html': 'innerHTML',
+  'readonly': 'readOnly',
+  'tabindex': 'tabIndex',
+};
 
 export class BrowserDomAdapter extends DomAdapter {
   static makeCurrent() {
     setRootDomAdapter(new BrowserDomAdapter());
   }
 
-  get attrToPropMap():Map {
-    return EMPTY_MAP
+  get attrToPropMap() {
+    return _attrToPropMap;
   }
 
   query(selector) {
@@ -75,7 +79,7 @@ export class BrowserDomAdapter extends DomAdapter {
     return res;
   }
   clearNodes(el) {
-    el.innerHTML = "";
+    el.innerHTML = '';
   }
   appendChild(el, node) {
     el.appendChild(node);
@@ -133,7 +137,7 @@ export class BrowserDomAdapter extends DomAdapter {
     return doc.createTextNode(text);
   }
   createScriptTag(attrName:string, attrValue:string, doc=document) {
-    var el = doc.createElement("SCRIPT");
+    var el = doc.createElement('SCRIPT');
     el.setAttribute(attrName, attrValue);
     return el;
   }
diff --git a/modules/angular2/src/dom/dom_adapter.js b/modules/angular2/src/dom/dom_adapter.js
@@ -15,9 +15,15 @@ function _abstract() {
  */
 @ABSTRACT()
 export class DomAdapter {
-  get attrToPropMap():Map {
+
+  /**
+   * Maps attribute names to their corresponding property names for cases
+   * where attribute name doesn't match property name.
+   */
+  get attrToPropMap() {
     throw _abstract();
   }
+
   parse(templateHtml:string) {
     throw _abstract();
   }

Original file line number	Diff line number	Diff line change
`@@ -91,26 +91,12 @@ function roleSetter(element, value) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`-// special mapping for cases where attribute name doesn't match property name`
`95`		`-var _lazyAttrToProp;`
`96`		`-`
`97`		`-function attrToProp() {`
`98`		`- if (!isPresent(_lazyAttrToProp)) {`
`99`		`- _lazyAttrToProp = StringMapWrapper.merge({`
`100`		`- "inner-html": "innerHTML",`
`101`		`- "readonly": "readOnly",`
`102`		`- "tabindex": "tabIndex",`
`103`		`- }, DOM.attrToPropMap);`
`104`		`- }`
`105`		`- return _lazyAttrToProp;`
`106`		`-}`
`107`		`-`
`108`	`94`	`// tells if an attribute is handled by the ElementBinderBuilder step`
`109`	`95`	`export function isSpecialProperty(propName:string) {`
`110`	`96`	`return StringWrapper.startsWith(propName, ARIA_PREFIX)`
`111`	`97`	`\|\| StringWrapper.startsWith(propName, CLASS_PREFIX)`
`112`	`98`	`\|\| StringWrapper.startsWith(propName, STYLE_PREFIX)`
`113`		`- \|\| StringMapWrapper.contains(attrToProp(), propName);`
	`99`	`+ \|\| StringMapWrapper.contains(DOM.attrToPropMap, propName);`
`114`	`100`	`}`
`115`	`101`
`116`	`102`	`/**`
`@@ -257,7 +243,7 @@ export class ElementBinderBuilder extends CompileStep {`
`257`	`243`	`}`
`258`	`244`
`259`	`245`	`_resolvePropertyName(attrName:string) {`
`260`		`- var mappedPropName = StringMapWrapper.get(attrToProp(), attrName);`
	`246`	`+ var mappedPropName = StringMapWrapper.get(DOM.attrToPropMap, attrName);`
`261`	`247`	`return isPresent(mappedPropName) ? mappedPropName : attrName;`
`262`	`248`	`}`
`263`	`249`	`}`