Merge branch 'hotfix/0.7.2'

CHANGELOG.md

@@ -1,5 +1,14 @@
 # w11k-select Changelog
 
+<a name="0.7.2"></a>
+## 0.7.2 (2016-08-09)
+
+
+### Bug Fixes
+
+* **options:** fix regular expression for parsing options ([645e331b](https://github.com/w11k/w11k-select/commit/645e331b3f8b03a52725f1a703c483ccc73cf096))
+
+
 <a name="0.7.1"></a>
 ## 0.7.1 (2016-02-29)
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "w11k-select",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": [
     "dist/w11k-select.js",
     "dist/w11k-select.tpl.js",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "w11k-select",
-  "version": "0.7.1",
+  "version": "0.7.2",
 
   "description": "single- and multi-select directive for angularjs",
   "keywords": [ "angular", "angularjs", "directive", "select", "multi-select", "bootstrap" ],

src/w11k-select.js

@@ -81,8 +81,8 @@ angular.module('w11k.select').constant('w11kSelectConfig', {
 
 angular.module('w11k.select').factory('w11kSelectHelper', ['$parse', '$document', function ($parse, $document) {
 
-  //                   value                 as    label                for       item              in    collection            |  filter                  track by     tracking
-  var OPTIONS_EXP = /^([a-zA-Z][\w\.]*)(?:\s+as\s+([a-zA-Z][\w\.]*))?\s+for\s+(?:([a-zA-Z][\w]*))\s+in\s+([a-zA-Z][\w\.]*(?:\s+\|\s[a-zA-Z][\w\:]*)*)(?:\s+track\sby\s+([a-zA-Z][\w\.]*))?$/;
+  //                   value                 as    label                for       item              in    collection                |  filter                        track by     tracking
+  var OPTIONS_EXP = /^([a-zA-Z][\w\.]*)(?:\s+as\s+([a-zA-Z][\w\.]*))?\s+for\s+(?:([a-zA-Z][\w]*))\s+in\s+([a-zA-Z][\w\.\(\)]*(?:\s+\|\s[a-zA-Z][\w\:_\{\}']*)*)(?:\s+track\sby\s+([a-zA-Z][\w\.]*))?$/;
 
   function extendDeep(dst) {
     angular.forEach(arguments, function (obj) {