From d385873e3696aade3d122cb1c28f0ce8f6af4b35 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Sat, 30 Jan 2016 14:58:38 +0100
Subject: [PATCH] Fix bindings with special characters

---
 src/lib/annotations/annotations.html | 2 +-
 test/unit/bind-elements.html         | 4 ++++
 test/unit/bind.html                  | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html
index 9cee6b0b..dcc2fd6a 100644
--- a/src/lib/annotations/annotations.html
+++ b/src/lib/annotations/annotations.html
@@ -90,7 +90,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     _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
index 4ab6265d..51bb01d9 100644
--- a/test/unit/bind-elements.html
+++ b/test/unit/bind-elements.html
@@ -55,6 +55,7 @@
       <div id="compound2">
         literal1 {{cpnd1}} literal2 {{cpnd2}}{{cpnd3.prop}} literal3 {{computeCompound(cpnd4, cpnd5, 'literal')}} literal4
       </div>
+      <span id="boundWithDash">{{objectWithDash.binding-with-dash}}</span>
   </template>
   <script>
     Polymer({
@@ -134,6 +135,9 @@
         },
         noComputedProp: {
           computed: 'foobared(noComputed)'
+        },
+        objectWithDash: {
+          type: Object
         }
       },
       observers: [
diff --git a/test/unit/bind.html b/test/unit/bind.html
index dd0cb055..d428997f 100644
--- a/test/unit/bind.html
+++ b/test/unit/bind.html
@@ -279,6 +279,13 @@ suite('single-element binding effects', function() {
     assert.equal(el.$.boundChild.computedWildcard, 15);
   });
 
+  test('binding with dash', function() {
+    el.objectWithDash = {
+      'binding-with-dash': 'yes'
+    };
+    assert.equal(el.$.boundWithDash.textContent, 'yes');
+  })
+
 });
 
 </script>