From d82840b17fa41e1eb1c1ebba8024ee255e555714 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Wed, 4 Nov 2015 16:07:31 -0800
Subject: [PATCH] rename host functions fix typos afterFirstRender is now
 raf+setTimeout dom-repeat: remove cruft

---
 polymer-mini.html                 |  6 +++---
 polymer.html                      |  6 +++---
 src/lib/bind/accessors.html       | 17 +++++++++++++----
 src/lib/collection.html           |  6 +++---
 src/lib/dom-api.html              |  7 +------
 src/lib/render-status.html        |  9 ++-------
 src/lib/style-util.html           |  2 +-
 src/lib/template/dom-repeat.html  | 21 +++++++++------------
 src/lib/template/templatizer.html | 29 +++++------------------------
 src/micro/attributes.html         |  5 ++++-
 src/micro/behaviors.html          |  7 +++++--
 src/micro/properties.html         |  8 +++++++-
 src/mini/ready.html               |  6 +++---
 src/mini/shady.html               |  1 +
 src/standard/annotations.html     | 12 ++++++------
 src/standard/configure.html       |  5 -----
 src/standard/effectBuilder.html   |  5 +----
 src/standard/styling.html         |  4 ++--
 src/standard/x-styling.html       |  5 +++--
 19 files changed, 72 insertions(+), 89 deletions(-)

diff --git a/polymer-mini.html b/polymer-mini.html
index cfd2b47c98..cf03ceffe2 100644
--- a/polymer-mini.html
+++ b/polymer-mini.html
@@ -41,16 +41,16 @@
     },
 
     _initFeatures: function() {
-      this._calcHost();
+      this._registerHost();
       if (this._template) {
         // manage local dom
         this._poolContent();
         // host stack
-        this._beginHost();
+        this._beginHosting();
         // instantiate template
         this._stampTemplate();
         // host stack
-        this._popHost();
+        this._endHosting();
       }
       // install host attributes
       this._marshalHostAttributes();
diff --git a/polymer.html b/polymer.html
index 46b62ff91e..3510433a04 100644
--- a/polymer.html
+++ b/polymer.html
@@ -63,16 +63,16 @@
       this._setupStyleProperties();
       // setup debouncers
       this._setupDebouncers();
-      this._calcHost();
+      this._registerHost();
       if (this._template) {
         // manage local dom
         this._poolContent();
         // host stack
-        this._beginHost();
+        this._beginHosting();
         // instantiate template
         this._stampTemplate();
         // host stack
-        this._popHost();
+        this._endHosting();
         // concretize template references
         this._marshalAnnotationReferences();
       }
diff --git a/src/lib/bind/accessors.html b/src/lib/bind/accessors.html
index 1b854b982e..4704c2b41e 100644
--- a/src/lib/bind/accessors.html
+++ b/src/lib/bind/accessors.html
@@ -248,13 +248,22 @@
         // Property listeners:
         // <node>.on.<property>-changed: <path]> = e.detail.value
         //console.log('[_setupBindListener]: [%s][%s] listening for [%s][%s-changed]', this.localName, info.path, info.id || info.index, info.property);
-        this._addNotifyListener(inst._nodes[info.index], inst, info);
+        //
+        // TODO(sorvell): fix templatizer to support this before uncommenting
+        // Optimization: only add bind listeners if the bound property is notifying...
+        var node = inst._nodes[info.index];
+        //var p = node._propertyInfo && node._propertyInfo[info.property];
+        //if (node._prepParentProperties || !node._propertyInfo || (p && p.notify)) {
+          this._addNotifyListener(node, inst, info.event, info.changedFn);
+        //}
       };
     },
 
-    _addNotifyListener: function(element, context, info) {
-      element.addEventListener(info.event, function(e) {
-        return context._notifyListener(info.changedFn, e);
+    // TODO(sorvell): note, adding these synchronously may impact performance,
+    // measure and consider if we can defer until after first paint in some cases at least.
+    _addNotifyListener: function(element, context, event, changedFn) {
+      element.addEventListener(event, function(e) {
+        return context._notifyListener(changedFn, e);
       });
     }
   };
diff --git a/src/lib/collection.html b/src/lib/collection.html
index 3a8ebd6a7f..71cd691336 100644
--- a/src/lib/collection.html
+++ b/src/lib/collection.html
@@ -131,14 +131,14 @@
     //    corresponding to the added/removed items
     _applySplices: function(splices) {
       // Dedupe added and removed keys to a final added/removed map
-      var keyMap = {}, key, i;
+      var keyMap = {}, key;
       for (var i=0, s; (i<splices.length) && (s=splices[i]); i++) {
         s.addedKeys = [];
-        for (j=0; j<s.removed.length; j++) {
+        for (var j=0; j<s.removed.length; j++) {
           key = this.getKey(s.removed[j]);
           keyMap[key] = keyMap[key] ? null : -1;
         }
-        for (j=0; j<s.addedCount; j++) {
+        for (var j=0; j<s.addedCount; j++) {
           var item = this.userArray[s.index + j];
           key = this.getKey(item);
           key = (key === undefined) ? this.add(item) : key;
diff --git a/src/lib/dom-api.html b/src/lib/dom-api.html
index bfaf8c839a..36fdfc20f8 100644
--- a/src/lib/dom-api.html
+++ b/src/lib/dom-api.html
@@ -931,12 +931,7 @@
       // actual children will be treated as the rendered state once lightChildren
       // is populated.
       if (!node._lightChildren) {
-        var c$ = [];
-        var n = node.firstChild;
-        while (n) {
-          c$.push(n);
-          n = n.nextSibling;
-        }
+        var c$ = arrayCopyChildNodes(node);
         for (var i=0, l=c$.length, child; (i<l) && (child=c$[i]); i++) {
           child._lightParent = child._lightParent || node;
         }
diff --git a/src/lib/render-status.html b/src/lib/render-status.html
index c6f20b3e0b..01fed70155 100644
--- a/src/lib/render-status.html
+++ b/src/lib/render-status.html
@@ -62,14 +62,9 @@
     },
 
     _flushAfterFirstRender: function() {
+      // we want to defer flush until just after the next paint.
       requestAnimationFrame(function() {
-        var self = Polymer.RenderStatus;
-        // if already ready, wait 2 frames to ensure async
-        if (self._ready) {
-          requestAnimationFrame(self.__flushAfterFirstRender);
-        } else {
-          self.__flushAfterFirstRender();
-        }
+        setTimeout(Polymer.RenderStatus.__flushAfterFirstRender);
       });
     },
 
diff --git a/src/lib/style-util.html b/src/lib/style-util.html
index 9646a9663b..f4c02ba677 100644
--- a/src/lib/style-util.html
+++ b/src/lib/style-util.html
@@ -145,7 +145,7 @@
       
       resolveCss: Polymer.ResolveUrl.resolveCss,
       parser: Polymer.CssParse,
-      ruleTypes: Polymer.CssParse.types,
+      ruleTypes: Polymer.CssParse.types
 
     };
 
diff --git a/src/lib/template/dom-repeat.html b/src/lib/template/dom-repeat.html
index b47678c79e..532af8e2f9 100644
--- a/src/lib/template/dom-repeat.html
+++ b/src/lib/template/dom-repeat.html
@@ -368,15 +368,16 @@
           }
         }
       }
+      // capture reference for use in filter/sort fn's
+      var self = this;
       // Apply user filter to keys
       if (this._filterFn) {
         keys = keys.filter(function(a) {
-          return this._filterFn(c.getItem(a));
-        }, this);
+          return self._filterFn(c.getItem(a));
+        });
       }
       // Apply user sort to keys
       if (this._sortFn) {
-        var self = this;
         keys.sort(function(a, b) {
           return self._sortFn(c.getItem(a), c.getItem(b));
         });
@@ -416,9 +417,6 @@
       var instances = this._instances;
       var keyMap = {};
       var pool = [];
-      var self = this;
-      var sortFn = this._sortFn || 
-        function(a, b) { return self._keySort(a, b); };
       // Dedupe added and removed keys to a final added/removed map
       for (var i=0, s; (i<splices.length) && (s=splices[i]); i++) {
         for (var j=0; j<s.removed.length; j++) {
@@ -456,16 +454,17 @@
           }
         }
       }
+      // capture reference for use in filter/sort fn's
+      var self = this;
       // Add instances for added keys
       if (addedKeys.length) {
         // Filter added keys
         if (this._filterFn) {
           addedKeys = addedKeys.filter(function(a) {
-            return this._filterFn(c.getItem(a));
-          }, this);
+            return self._filterFn(c.getItem(a));
+          });
         }
         // Sort added keys
-        var self = this;
         addedKeys.sort(function(a, b) {
           return self._sortFn(c.getItem(a), c.getItem(b));
         });
@@ -482,13 +481,11 @@
       var item = c.getItem(key);
       var end = this._instances.length - 1;
       var idx = -1;
-      var sortFn = this._sortFn || 
-        function(a, b) { return self._keySort(a, b); };
       // Binary search for insertion point
       while (start <= end) {
         var mid = (start + end) >> 1;
         var midKey = this._instances[mid].__key__;
-        var cmp = sortFn(c.getItem(midKey), item);
+        var cmp = this._sortFn(c.getItem(midKey), item);
         if (cmp < 0) {
           start = mid + 1;
         } else if (cmp > 0) {
diff --git a/src/lib/template/templatizer.html b/src/lib/template/templatizer.html
index b8bf0c7bb7..1adc6834dd 100644
--- a/src/lib/template/templatizer.html
+++ b/src/lib/template/templatizer.html
@@ -248,16 +248,16 @@
             Polymer.Bind._createAccessors(proto, parentProp, effects);
           }
         }
+        // capture this reference for use below
+        var self = this;
         // Instance setup
         if (template != this) {
           Polymer.Bind.prepareInstance(template);
-          var self = this;
           template._forwardParentProp = function(source, value) {
             self._forwardParentProp(source, value);
           }
         }
         this._extendTemplate(template, proto);
-        var self = this;
         template._pathEffector = function(path, value, fromAbove) {
           return self._pathEffectorImpl(path, value, fromAbove);  
         }
@@ -332,12 +332,12 @@
     _constructorImpl: function(model, host) {
       this._rootDataHost = host._getRootDataHost();
       this._setupConfigure(model);
-      this._calcHost(host);
-      this._beginHost();
+      this._registerHost(host);
+      this._beginHosting();
       this.root = this.instanceTemplate(this._template);
       this.root.__noContent = !this._notes._hasContent;
       this.root.__styleScoped = true;
-      this._popHost();
+      this._endHosting();
       this._marshalAnnotatedNodes();
       this._marshalInstanceEffects();
       this._marshalAnnotatedListeners();
@@ -450,25 +450,6 @@
       }
     }
 
-    // TODO(sorvell): note, using the template as host is ~5-10% faster if
-    // elements have no default values.
-    // _constructorImpl: function(model, host) {
-    //   this._setupConfigure(model);
-    //   host._beginHost();
-    //   this.root = this.instanceTemplate(this._template);
-    //   host._popHost();
-    //   this._marshalTemplateContent();
-    //   this._marshalAnnotatedNodes();
-    //   this._marshalInstanceEffects();
-    //   this._marshalAnnotatedListeners();
-    //   this._ready();
-    // },
-
-    // stamp: function(model) {
-    //   return new this.ctor(model, this.dataHost);
-    // }
-
-
   };
 
 </script>
diff --git a/src/micro/attributes.html b/src/micro/attributes.html
index 73eadb16e0..2f68da485c 100644
--- a/src/micro/attributes.html
+++ b/src/micro/attributes.html
@@ -60,6 +60,7 @@
 
   Polymer.Base._addFeature({
 
+    // prototype time
     _addHostAttributes: function(attributes) {
       if (!this._aggregatedAttributes) {
         this._aggregatedAttributes = {};
@@ -69,6 +70,7 @@
       }
     },
 
+    // instance time
     _marshalHostAttributes: function() {
       if (this._aggregatedAttributes) {
         this._applyAttributes(this, this._aggregatedAttributes);
@@ -88,7 +90,7 @@
           // if necessary, add this value to configuration...
           if (!this._clientsReadied && this._propertyInfo[n] &&
             (this._config[n] === undefined)) {
-            this._config[n] = v;
+            this._configValue(n, v);
           }
         }
       }
@@ -114,6 +116,7 @@
       if (!this._serializing) {
         var property = property || Polymer.CaseMap.dashToCamelCase(attribute);
         // fallback to property lookup
+        // TODO(sorvell): check for _propertyInfo existence because of dom-bind
         info = info || (this._propertyInfo && this._propertyInfo[property]);
         if (info && !info.readOnly) {
           var v = this.getAttribute(attribute);
diff --git a/src/micro/behaviors.html b/src/micro/behaviors.html
index 160df13579..ad4945b033 100644
--- a/src/micro/behaviors.html
+++ b/src/micro/behaviors.html
@@ -97,7 +97,7 @@
     _mixinBehavior: function(b) {
       var n$ = Object.getOwnPropertyNames(b);
       for (var i=0, n; (i<n$.length) && (n=n$[i]); i++) {
-        if (!Polymer.Base._behaviorMethods[n] && !this.hasOwnProperty(n)) {
+        if (!Polymer.Base._behaviorProperties[n] && !this.hasOwnProperty(n)) {
           this.copyOwnProperty(n, b, this);
         }
       }
@@ -141,7 +141,10 @@
 
   });
 
-  Polymer.Base._behaviorMethods = {
+  // special properties on behaviors are not mixed in and are instead 
+  // either processed specially (e.g. listeners, properties) or available
+  // for calling via doBehavior (e.g. created, ready)
+  Polymer.Base._behaviorProperties = {
     hostAttributes: true,
     registered: true,
     properties: true,
diff --git a/src/micro/properties.html b/src/micro/properties.html
index 2b4633a539..dde4ad0480 100644
--- a/src/micro/properties.html
+++ b/src/micro/properties.html
@@ -152,7 +152,7 @@
           // optimization: avoid info'ing properties that are protected and
           // not read only since they are not needed for attributes or
           // configuration.
-          if (i.indexOf('_') === 0 && !s.readOnly) {
+          if (i[0] === '_' && !s.readOnly) {
             continue;
           }
           if (!target[i]) {
@@ -165,6 +165,12 @@
             if (!t.readOnly) {
               t.readOnly = s.readOnly;
             }
+            if (!t.notify) {
+              t.notify = s.notify;
+            }
+            if (!t.readOnly) {
+              t.readOnly = s.readOnly;
+            }
           }
         }
       }
diff --git a/src/mini/ready.html b/src/mini/ready.html
index 5aa67ab55e..2807a5a8e0 100644
--- a/src/mini/ready.html
+++ b/src/mini/ready.html
@@ -62,7 +62,7 @@
     // any bindings for the element.  Only elements originally
     // stamped from Polymer templates have a dataHost, and this
     // never changes
-    _calcHost: function(host) {
+    _registerHost: function(host) {
       // NOTE: The `dataHost` of an element never changes.
       this.dataHost = host = host || 
         Polymer.Base._hostStack[Polymer.Base._hostStack.length-1];
@@ -73,14 +73,14 @@
 
     // establish this element as the current hosting element (allows
     // any elements we stamp to easily set host to us).
-    _beginHost: function() {
+    _beginHosting: function() {
       Polymer.Base._hostStack.push(this);
       if (!this._clients) {
         this._clients = [];
       }
     },
 
-    _popHost: function() {
+    _endHosting: function() {
       // this element is no longer the current hosting element
       Polymer.Base._hostStack.pop();
     },
diff --git a/src/mini/shady.html b/src/mini/shady.html
index 6edab074dd..4734678e15 100644
--- a/src/mini/shady.html
+++ b/src/mini/shady.html
@@ -55,6 +55,7 @@
       _createLocalRoot: function() {
         this.shadyRoot = this.root;
         this.shadyRoot._distributionClean = false;
+        this.shadyRoot._hasDistributed = false;
         this.shadyRoot._isShadyRoot = true;
         this.shadyRoot._dirtyRoots = [];
         // capture insertion point list
diff --git a/src/standard/annotations.html b/src/standard/annotations.html
index 60012335be..8f95261d3d 100644
--- a/src/standard/annotations.html
+++ b/src/standard/annotations.html
@@ -187,8 +187,8 @@
           for (var k=0, p$=b.parts, p; (k<p$.length) && (p=p$[k]); k++) {
             if (p.signature) {
               var args = p.signature.args;
-              for (var k=0; k<args.length; k++) {
-                pp[args[k].model] = true;
+              for (var kk=0; kk<args.length; kk++) {
+                pp[args[kk].model] = true;
               }
             } else {
               pp[p.model] = true;
@@ -291,10 +291,10 @@
 
     // concretize `_nodes` map (from anonymous annotations)
     _marshalAnnotatedNodes: function() {
-      if (this._nodes && this._nodes.length) {
-        var r = new Array(this._nodes.length);
-        for (var i=0; i < this._nodes.length; i++) {
-          r[i] = this._findAnnotatedNode(this.root, this._nodes[i]);
+      if (this._notes && this._notes.length) {
+        var r = new Array(this._notes.length);
+        for (var i=0; i < this._notes.length; i++) {
+          r[i] = this._findAnnotatedNode(this.root, this._notes[i]);
         }
         this._nodes = r;
       }
diff --git a/src/standard/configure.html b/src/standard/configure.html
index 2818abd3fd..1e4f3231f2 100644
--- a/src/standard/configure.html
+++ b/src/standard/configure.html
@@ -124,11 +124,6 @@
 
     _mixinConfigure: function(a, b) {
       for (var prop in b) {
-        //if (!this.getPropertyInfo(prop).readOnly) {
-        // TODO(sorvell): tempatized things don't have _propertyInfo atm
-        // so fallback to property lookup.
-        // var info = this._propertyInfo && this._propertyInfo[prop] || 
-        //   this.getPropertyInfo(prop);
         var info = this._propertyInfo[prop];
         if (!info || !info.readOnly) {
           a[prop] = b[prop];
diff --git a/src/standard/effectBuilder.html b/src/standard/effectBuilder.html
index c96308ff99..e2154c7929 100644
--- a/src/standard/effectBuilder.html
+++ b/src/standard/effectBuilder.html
@@ -116,15 +116,12 @@
     },
 
     _addAnnotationEffects: function(notes) {
-      // create a virtual annotation list, must be concretized at instance time
-      this._nodes = [];
       // process annotations that have been parsed from template
       for (var i=0, note; (i<notes.length) && (note=notes[i]); i++)  {
         // where to find the node in the concretized list
-        var index = this._nodes.push(note) - 1;
         var b$ = note.bindings;
         for (var j=0, binding; (j<b$.length) && (binding=b$[j]); j++) {
-          this._addAnnotationEffect(binding, index);
+          this._addAnnotationEffect(binding, i);
         }
       }
     },
diff --git a/src/standard/styling.html b/src/standard/styling.html
index 9da8c7cd20..438efc212f 100644
--- a/src/standard/styling.html
+++ b/src/standard/styling.html
@@ -137,8 +137,8 @@
           var mo = new MutationObserver(function(mxns) {
             for (var i=0, m; (i<mxns.length) && (m=mxns[i]); i++) {
               if (m.addedNodes) {
-                for (var i=0; i < m.addedNodes.length; i++) {
-                  scopify(m.addedNodes[i]);
+                for (var j=0; j < m.addedNodes.length; j++) {
+                  scopify(m.addedNodes[j]);
                 }
               }
             }
diff --git a/src/standard/x-styling.html b/src/standard/x-styling.html
index aeb6543f59..73a003b30e 100644
--- a/src/standard/x-styling.html
+++ b/src/standard/x-styling.html
@@ -192,8 +192,9 @@
           }
         }
         // note: using Polymer.dom here ensures that any attribute sets
-        // will provoke distribution if necessary
-        node = this._clientsReadied ? Polymer.dom(node) : node;
+        // will provoke distribution if necessary; do this iff necessary
+        node = (this.shadyRoot && this.shadyRoot._hasDistributed) ? 
+          Polymer.dom(node) : node;
         serializeValueToAttribute.call(this, value, attribute, node);
       },