From 3f1bc4e33a63ef3517f61003f77212faac5f74d7 Mon Sep 17 00:00:00 2001
From: herr kaste <herr.kaste@googlemail.com>
Date: Mon, 1 Feb 2016 23:31:03 +0100
Subject: [PATCH] Support dynamic functions for computed annotations.

Alternate take for #3299
---
 src/standard/annotations.html | 13 +++++++++++--
 test/unit/bind-elements.html  | 32 ++++++++++++++++++++++++++++++++
 test/unit/bind.html           | 30 ++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/standard/annotations.html b/src/standard/annotations.html
index 7c845c679e..7ec8548ff1 100644
--- a/src/standard/annotations.html
+++ b/src/standard/annotations.html
@@ -145,8 +145,17 @@
           for (var k=0; k<b.parts.length; k++) {
             var p = b.parts[k];
             if (!p.literal) {
-              p.signature = this._parseMethod(p.value);
-              if (!p.signature) {
+              var signature = this._parseMethod(p.value);
+              if (signature) {
+                var method = signature.method;
+                if (this.properties[method]) {
+                  var args = signature.args || [];
+                  args.push(this._parseArg(method));
+                  signature.args = args;
+                  signature.static = false;
+                }
+                p.signature = signature;
+              } else {
                 p.model = this._modelForPath(p.value);
               }
             }
diff --git a/test/unit/bind-elements.html b/test/unit/bind-elements.html
index 851c6d4a61..a39e985838 100644
--- a/test/unit/bind-elements.html
+++ b/test/unit/bind-elements.html
@@ -582,3 +582,35 @@
   })();
   </script>
 </dom-module>
+
+<dom-module id="x-bind-computed-property">
+  <template>
+    <div id="check">[[translate('Hello World.')]]</div>
+  </template>
+  <script>
+    Polymer({
+      is: 'x-bind-computed-property',
+      properties: {
+        translate: {
+          type: Function,
+          computed: '_computeTranslateFn(translator)'
+        },
+        translator: {
+          type: Function,
+          value: function() {
+            return function(message) {
+              return 'translated: ' + message;
+            }
+          }
+        },
+      },
+
+      _computeTranslateFn: function(translator) {
+        return function(message) {
+          return translator(message);
+        }
+      },
+
+    });
+  </script>
+</dom-module>
diff --git a/test/unit/bind.html b/test/unit/bind.html
index 1bd95331bf..752b5cfe13 100644
--- a/test/unit/bind.html
+++ b/test/unit/bind.html
@@ -285,6 +285,36 @@
 
 <script>
 
+suite('computed properties', function() {
+
+  var el;
+
+  setup(function() {
+
+  });
+
+  teardown(function() {
+    document.body.removeChild(el);
+  });
+
+  test('x', function() {
+    el = document.createElement('x-bind-computed-property');
+    document.body.appendChild(el);
+
+    assert.equal(el.$.check.textContent, 'translated: Hello World.');
+
+    el.translator = function(message) {
+      return 'changed: ' + message;
+    }
+
+    assert.equal(el.$.check.textContent, 'changed: Hello World.');
+  });
+
+});
+
+</script>
+
+<script>
 suite('2-way binding effects between elements', function() {
 
   var el;