Merge branch 'master' of https://github.com/loose11/ui-select into lo…

…ose11-master # Conflicts: # dist/select.css # dist/select.js # dist/select.min.css # dist/select.min.js
angular-ui · Feb 18, 2016 · 457be42 · 457be42
2 parents b1c4fdc + 583f2ba
commit 457be42
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js
@@ -105,10 +105,13 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
             locals[$select.parserResult.itemName] = list[p];
             result = $select.parserResult.modelMapper(scope, locals);
             if($select.parserResult.trackByExp){
-                var matches = /\.(.+)/.exec($select.parserResult.trackByExp);
-                if(matches.length>0 && result[matches[1]] == value[matches[1]]){
-                    resultMultiple.unshift(list[p]);
-                    return true;
+                var propsItemNameMatches = /(\w*)\./.exec($select.parserResult.trackByExp);
+                var matches = /\.([^\s]+)/.exec($select.parserResult.trackByExp);
+                if(propsItemNameMatches.length > 0 && propsItemNameMatches[1] == $select.parserResult.itemName){
+                  if(matches.length>0 && result[matches[1]] == value[matches[1]]){
+                      resultMultiple.unshift(list[p]);
+                      return true;
+                  }
                 }
             }
             if (angular.equals(result,value)){