Simplify more.

Polymer · Nov 20, 2015 · 186e053 · 186e053
1 parent a3d17d5
commit 186e053
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html
@@ -90,18 +90,18 @@
     },
 
     _bindingRegex: (function() {
-      var IDENT  = '(?:' + '[a-zA-Z_$][a-zA-Z0-9_.:$-]*'  + '\\s*' + ')';
-      var NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?'  + '\\s*' + ')';
-      var SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\''  + '\\s*' + ')';
-      var DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"'  + '\\s*' + ')';
+      var IDENT  = '(?:' + '[a-zA-Z_$][\\w.:$-]*' + ')';
+      var NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + ')';
+      var SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')';
+      var DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')';
       var STRING = '(?:' + SQUOTE_STRING + '|' + DQUOTE_STRING + ')';
-      var ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' +  STRING + ')';
+      var ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' +  STRING + '\\s*' + ')';
       var ARGUMENTS = '(?:' + ARGUMENT + '(?:,\\s*' + ARGUMENT + ')*' + ')';
       var ARGUMENT_LIST = '(?:' + '\\(\\s*' +
                                     '(?:' + ARGUMENTS + '?' + ')' +
                                   '\\)\\s*' + ')';
-      var BINDING = '(' + IDENT + ARGUMENT_LIST + '?' + ')'; // Group 3
-      var OPEN_BRACKET = '(\\[\\[|{{)'  + '\\s*';
+      var BINDING = '(' + IDENT + '\\s*' + ARGUMENT_LIST + '?' + ')'; // Group 3
+      var OPEN_BRACKET = '(\\[\\[|{{)' + '\\s*';
       var CLOSE_BRACKET = '(?:]]|}})';
       var NEGATE = '(?:(!)\\s*)?'; // Group 2
       var EXPRESSION = OPEN_BRACKET + NEGATE + BINDING + CLOSE_BRACKET;