Include wildcard character in identifier. Fixes #3084.

Polymer · Nov 24, 2015 · c36d6c1 · c36d6c1
1 parent e5fb166
commit c36d6c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html
@@ -90,7 +90,7 @@
     },
 
     _bindingRegex: (function() {
-      var IDENT  = '(?:' + '[a-zA-Z_$][\\w.:$-]*' + ')';
+      var IDENT  = '(?:' + '[a-zA-Z_$][\\w.:$-*]*' + ')';
       var NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + ')';
       var SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')';
       var DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')';

diff --git a/test/unit/bind-elements.html b/test/unit/bind-elements.html
@@ -13,6 +13,7 @@
       neg-computed-inline="{{!computeInline(value,add,divide)}}"
       computed-negative-number="{{computeNegativeNumber(-1)}}"
       computed-negative-literal="{{computeNegativeNumber(-A)}}"
+      computed-wildcard="{{computeWildcard(a, b.*)}}"
       style$="{{boundStyle}}"
       data-id$="{{dataSetId}}"
       custom-event-value="{{customEventValue::custom}}"
@@ -256,6 +257,9 @@
       },
       computeCompound: function(a, b, c) {
         return '' + c + b + a;
+      },
+      computeWildcard: function(a, bInfo) {
+        return a + (bInfo && bInfo.base ? bInfo.base.value  : 0);
       }
     });
   </script>

diff --git a/test/unit/bind.html b/test/unit/bind.html
@@ -269,6 +269,12 @@
     assert.equal(el.$.boundChild.computedNegativeLiteral, undefined);
   });
 
+  test('computed binding with wildcard', function() {
+    el.a = 5;
+    el.b = {value: 10};
+    assert.equal(el.$.boundChild.computedWildcard, 15);
+  });
+
 });
 
 </script>