Merge pull request #131 from angular-ui/fix-singlebinding

Correctly bind single properties to child array
angular-ui · Aug 1, 2014 · df2e931 · df2e931
2 parents e14d024 + e298c05
commit df2e931
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ui-select",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "homepage": "https://github.com/angular-ui/ui-select",
   "authors": [
     "AngularUI"

diff --git a/dist/select.css b/dist/select.css
@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.5.0 - 2014-07-30T04:47:33.136Z
+ * Version: 0.5.1 - 2014-08-01T01:09:37.152Z
  * License: MIT
  */
 

diff --git a/dist/select.js b/dist/select.js
@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.5.0 - 2014-07-30T04:47:33.132Z
+ * Version: 0.5.1 - 2014-08-01T01:09:37.148Z
  * License: MIT
  */
 
@@ -72,7 +72,7 @@
 
       return {
         itemName: match[2], // (lhs) Left-hand side,
-        source: match[3], // (rhs) Right-hand side,
+        source: $parse(match[3]),
         trackByExp: match[4],
         modelMapper: $parse(match[1] || match[2])
       };
@@ -358,8 +358,7 @@
 
         //From model --> view
         ngModel.$formatters.unshift(function (inputValue) {
-          var match = $select.parserResult.source.match(/^\s*([\S]+).*$/);
-          var data = scope[match[1]];
+          var data = $select.parserResult.source(scope);
           if (data){
             for (var i = data.length - 1; i >= 0; i--) {
               var locals = {};

diff --git a/dist/select.min.css b/dist/select.min.css
diff --git a/dist/select.min.js b/dist/select.min.js
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "repository": {
     "url": "git://github.com/angular-ui/ui-select.git"
   },
-  "version": "0.5.0",
+  "version": "0.5.1",
   "devDependencies": {
     "bower": "~1.3",
     "del": "~0.1.1",

diff --git a/src/select.js b/src/select.js
@@ -64,7 +64,7 @@
 
       return {
         itemName: match[2], // (lhs) Left-hand side,
-        source: match[3], // (rhs) Right-hand side,
+        source: $parse(match[3]),
         trackByExp: match[4],
         modelMapper: $parse(match[1] || match[2])
       };
@@ -350,8 +350,7 @@
 
         //From model --> view
         ngModel.$formatters.unshift(function (inputValue) {
-          var match = $select.parserResult.source.match(/^\s*([\S]+).*$/);
-          var data = scope[match[1]];
+          var data = $select.parserResult.source(scope);
           if (data){
             for (var i = data.length - 1; i >= 0; i--) {
               var locals = {};