From 4745e8fb46f57ca296b8b8cd21ff75024c15803f Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Mon, 19 Oct 2015 17:09:43 -0700
Subject: [PATCH] Assemble effect strings at prototype time.

---
 src/lib/bind/accessors.html       | 12 +++---------
 src/lib/bind/effects.html         |  6 +++---
 src/lib/template/templatizer.html | 10 ++++++++--
 src/micro/attributes.html         | 11 +++++++----
 src/standard/effectBuilder.html   |  7 +++++--
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/lib/bind/accessors.html b/src/lib/bind/accessors.html
index 04de6c3a7e..265ca662ea 100644
--- a/src/lib/bind/accessors.html
+++ b/src/lib/bind/accessors.html
@@ -21,11 +21,8 @@
 
     _modelApi: {
 
-      _notifyChange: function(property) {
-        var eventName = Polymer.CaseMap.camelToDashCase(property) + '-changed';
-        Polymer.Base.fire(eventName, {
-          value: this[property]
-        }, {bubbles: false, node: this});
+      _notifyChange: function(event, value) {
+        Polymer.Base.fire(event, {value: value}, {bubbles: false, node: this});
       },
 
       // TODO(sjmiles): removing _notifyListener from here breaks accessors.html
@@ -80,10 +77,7 @@
 
       _effectEffects: function(property, value, effects, old, fromAbove) {
         for (var i=0, l=effects.length, fx; (i<l) && (fx=effects[i]); i++) {
-          var fn = fx.fn || Polymer.Bind['_' + fx.kind + 'Effect'];
-          if (fn) {
-            fn.call(this, property, value, fx.effect, old, fromAbove);
-          }
+          fx.fn.call(this, property, value, fx.effect, old, fromAbove);
         }
       },
 
diff --git a/src/lib/bind/effects.html b/src/lib/bind/effects.html
index 2643164e67..4aa3f13197 100644
--- a/src/lib/bind/effects.html
+++ b/src/lib/bind/effects.html
@@ -35,13 +35,13 @@
       }
     },
 
-    _reflectEffect: function(source) {
-      this.reflectPropertyToAttribute(source);
+    _reflectEffect: function(source, value, effect) {
+      this.reflectPropertyToAttribute(source, effect.attribute, value);
     },
 
     _notifyEffect: function(source, value, effect, old, fromAbove) {
       if (!fromAbove) {
-        this._notifyChange(source);
+        this._notifyChange(effect.event, value);
       }
     },
 
diff --git a/src/lib/template/templatizer.html b/src/lib/template/templatizer.html
index 9466bca24b..035e410db1 100644
--- a/src/lib/template/templatizer.html
+++ b/src/lib/template/templatizer.html
@@ -231,11 +231,17 @@
           // that should be implemented by Templatizer users
           for (prop in parentProps) {
             var parentProp = this._parentPropPrefix + prop;
+            // TODO(sorvell): remove reference Bind library functions here.
+            // Needed for effect optimization.
             var effects = [{
               kind: 'function',
-              effect: this._createForwardPropEffector(prop)
+              effect: this._createForwardPropEffector(prop),
+              fn: Polymer.Bind._functionEffect
             }, {
-              kind: 'notify'
+              kind: 'notify',
+              fn: Polymer.Bind._notifyEffect,
+              effect: {event: 
+                Polymer.CaseMap.camelToDashCase(parentProp) + '-changed'}
             }];
             Polymer.Bind._createAccessors(proto, parentProp, effects);
           }
diff --git a/src/micro/attributes.html b/src/micro/attributes.html
index f720bee8c7..679ca6e19f 100644
--- a/src/micro/attributes.html
+++ b/src/micro/attributes.html
@@ -118,12 +118,15 @@
      * `properties` configuration to achieve automatic attribute reflection.
      *
      * @method reflectPropertyToAttribute
-     * @param {string} name Property name to reflect.
+     * @param {string} property Property name to reflect.
+     * @param {*=} attribute Attribute name to reflect.
+     * @param {*=} value Property value to refect.
      */
-    reflectPropertyToAttribute: function(name) {
+    reflectPropertyToAttribute: function(property, attribute, value) {
       this._serializing = true;
-      this.serializeValueToAttribute(this[name],
-        Polymer.CaseMap.camelToDashCase(name));
+      value = (value === undefined) ? this[property] : value;
+      this.serializeValueToAttribute(value,
+        attribute || Polymer.CaseMap.camelToDashCase(property));
       this._serializing = false;
     },
 
diff --git a/src/standard/effectBuilder.html b/src/standard/effectBuilder.html
index e64495a3f6..72d2865a25 100644
--- a/src/standard/effectBuilder.html
+++ b/src/standard/effectBuilder.html
@@ -60,10 +60,13 @@
             this._addComputedEffect(p, prop.computed);
           }
           if (prop.notify) {
-            this._addPropertyEffect(p, 'notify');
+            this._addPropertyEffect(p, 'notify', {
+              event: Polymer.CaseMap.camelToDashCase(p) + '-changed'});
           }
           if (prop.reflectToAttribute) {
-            this._addPropertyEffect(p, 'reflect');
+            this._addPropertyEffect(p, 'reflect', {
+              attribute: Polymer.CaseMap.camelToDashCase(p)
+            });
           }
           if (prop.readOnly) {
             // Ensure accessor is created