Merge commit 'a67131e2d8b77f4d3e825e382819d8708e9055de'

Conflicts:
	dist/select.css
	dist/select.css.min.css
	dist/select.js
	dist/select.min.js
	src/select.js

Author: tvervest

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-select",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "homepage": "https://github.com/angular-ui/ui-select",
   "authors": [
     "AngularUI"
@@ -13,7 +13,10 @@
     "node_modules",
     "bower_components",
     "src",
-    "test"
+    "test",
+    "gulpfile.js",
+    "karma.conf.js",
+    "examples"
   ],
   "dependencies": {
     "angular": "~1.2"

dist/select.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.7.0 - 2014-10-06T12:31:14.676Z
+ * Version: 0.8.0 - 2014-10-07T13:28:21.748Z
  * License: MIT
  */
 
@@ -121,6 +121,10 @@
   line-height: 0.75;
 }
 
+.ui-select-multiple.ui-select-bootstrap .ui-select-match-item{
+  outline: 0;
+}
+
 .ui-select-bootstrap .ui-select-choices-row>a {
     display: block;
     padding: 3px 20px;

dist/select.css.min.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.7.0 - 2014-10-06T12:31:14.673Z
+ * Version: 0.8.0 - 2014-10-07T13:28:21.745Z
  * License: MIT
  */
 
@@ -269,11 +269,12 @@
       if (ctrl.multiple){
         //Remove already selected items 
         $scope.$watchCollection('$select.selected', function(selectedItems){
-          if (!selectedItems) return;
+          if (!selectedItems.length) return;
           var data = ctrl.parserResult.source($scope);
           if (!data) return;
           var filteredItems = data.filter(function(i) {return selectedItems.indexOf(i) < 0;});
           setItemsFn(filteredItems);
+          ctrl.sizeSearchInput();
         });
       }
 
@@ -592,13 +593,11 @@
               result;
           if ($select.multiple){
             var resultMultiple = [];
-            if (inputValue) {
-              for (var j = inputValue.length - 1; j >= 0; j--) {
-                locals = {};
-                locals[$select.parserResult.itemName] = inputValue[j];
-                result = $select.parserResult.modelMapper(scope, locals);
-                resultMultiple.unshift(result);
-              }
+            for (var j = $select.selected.length - 1; j >= 0; j--) {
+              locals = {};
+              locals[$select.parserResult.itemName] = $select.selected[j];
+              result = $select.parserResult.modelMapper(scope, locals);
+              resultMultiple.unshift(result);
             }
             return resultMultiple;
           }else{
@@ -758,10 +757,8 @@
         });
 
         if ($select.multiple){
-          scope.$watchCollection('$select.selected', function(newValue) {
-            //On v1.2.19 the 2nd and 3rd parameteres are ignored
-            //On v1.3.0-beta+ 3rd parameter (revalidate) is true, to force $parsers to recreate model
-            ngModel.$setViewValue(newValue, null, true);
+          scope.$watchCollection('$select.selected', function() {
+            ngModel.$setViewValue(Date.now()); //Set timestamp as a unique string to force changes
           });
           focusser.prop('disabled', true); //Focusser isn't needed if multiple
         }else{
@@ -955,7 +952,7 @@
 }());
 
 angular.module("ui.select").run(["$templateCache", function($templateCache) {$templateCache.put("bootstrap/choices.tpl.html","<ul class=\"ui-select-choices ui-select-choices-content dropdown-menu\" role=\"menu\" aria-labelledby=\"dLabel\" ng-show=\"$select.items.length > 0\"><li class=\"ui-select-choices-group\"><div class=\"divider\" ng-show=\"$select.isGrouped && $index > 0\"></div><div ng-show=\"$select.isGrouped\" class=\"ui-select-choices-group-label dropdown-header\">{{$group.name}}</div><div class=\"ui-select-choices-row\" ng-class=\"{active: $select.isActive(this), disabled: $select.isDisabled(this)}\"><a href=\"javascript:void(0)\" class=\"ui-select-choices-row-inner\"></a></div></li></ul>");
-$templateCache.put("bootstrap/match-multiple.tpl.html","<span class=\"ui-select-match\"><span ng-repeat=\"$item in $select.selected\"><button style=\"margin-right: 3px;\" class=\"ui-select-match-item btn btn-default btn-xs\" tabindex=\"-1\" type=\"button\" ng-disabled=\"$select.disabled\" ng-click=\"$select.activeMatchIndex = $index;\" ng-class=\"{\'btn-primary\':$select.activeMatchIndex === $index}\"><span class=\"close ui-select-match-close\" ng-hide=\"$select.disabled\" ng-click=\"$select.removeChoice($index)\">&nbsp;&times;</span> <span uis-transclude-append=\"\"></span></button></span></span>");
+$templateCache.put("bootstrap/match-multiple.tpl.html","<span class=\"ui-select-match\"><span ng-repeat=\"$item in $select.selected\"><span style=\"margin-right: 3px;\" class=\"ui-select-match-item btn btn-default btn-xs\" tabindex=\"-1\" type=\"button\" ng-disabled=\"$select.disabled\" ng-click=\"$select.activeMatchIndex = $index;\" ng-class=\"{\'btn-primary\':$select.activeMatchIndex === $index}\"><span class=\"close ui-select-match-close\" ng-hide=\"$select.disabled\" ng-click=\"$select.removeChoice($index)\">&nbsp;&times;</span> <span uis-transclude-append=\"\"></span></span></span></span>");
 $templateCache.put("bootstrap/match.tpl.html","<button type=\"button\" class=\"btn btn-default form-control ui-select-match\" tabindex=\"-1\" ng-hide=\"$select.open\" ng-disabled=\"$select.disabled\" ng-class=\"{\'btn-default-focus\':$select.focus}\" ;=\"\" ng-click=\"$select.activate()\"><span ng-show=\"$select.searchEnabled && $select.isEmpty()\" class=\"text-muted\">{{$select.placeholder}}</span> <span ng-hide=\"$select.isEmpty()\" ng-transclude=\"\"></span> <span class=\"caret ui-select-toggle\" ng-click=\"$select.toggle($event)\"></span></button>");
 $templateCache.put("bootstrap/select-multiple.tpl.html","<div class=\"ui-select-multiple ui-select-bootstrap dropdown form-control\" ng-class=\"{open: $select.open}\"><div><div class=\"ui-select-match\"></div><input type=\"text\" autocomplete=\"off\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\" class=\"ui-select-search input-xs\" placeholder=\"{{$select.getPlaceholder()}}\" ng-disabled=\"$select.disabled\" ng-hide=\"$select.disabled\" ng-click=\"$select.activate()\" ng-model=\"$select.search\"></div><div class=\"ui-select-choices\"></div></div>");
 $templateCache.put("bootstrap/select.tpl.html","<div class=\"ui-select-bootstrap dropdown\" ng-class=\"{open: $select.open}\"><div class=\"ui-select-match\"></div><input type=\"text\" autocomplete=\"off\" tabindex=\"-1\" class=\"form-control ui-select-search\" placeholder=\"{{$select.placeholder}}\" ng-model=\"$select.search\" ng-show=\"$select.searchEnabled && $select.open\"><div class=\"ui-select-choices\"></div></div>");

dist/select.js

@@ -1,11 +1,12 @@
 {
   "name": "ui-select",
+  "main": "dist/select.js",
   "author": "http://github.com/angular-ui/ui-select/graphs/contributors",
   "homepage": "http://github.com/angular-ui/ui-select",
   "repository": {
     "url": "git://github.com/angular-ui/ui-select.git"
   },
-  "version": "0.7.0",
+  "version": "0.8.0",
   "devDependencies": {
     "bower": "~1.3",
     "del": "~0.1.1",

dist/select.js.min.js

@@ -1,6 +1,6 @@
 <span class="ui-select-match">
   <span ng-repeat="$item in $select.selected">
-    <button 
+    <span 
       style="margin-right: 3px;"
       class="ui-select-match-item btn btn-default btn-xs"
       tabindex="-1"
@@ -10,6 +10,6 @@
       ng-class="{'btn-primary':$select.activeMatchIndex === $index}">
         <span class="close ui-select-match-close" ng-hide="$select.disabled" ng-click="$select.removeChoice($index)">&nbsp;&times;</span>
         <span uis-transclude-append></span>
-    </button>
+    </span>
   </span>
-</span>
+</span>

package.json

@@ -113,6 +113,10 @@
   line-height: 0.75;
 }
 
+.ui-select-multiple.ui-select-bootstrap .ui-select-match-item{
+  outline: 0;
+}
+
 .ui-select-bootstrap .ui-select-choices-row>a {
     display: block;
     padding: 3px 20px;

src/bootstrap/match-multiple.tpl.html

@@ -261,11 +261,12 @@
       if (ctrl.multiple){
         //Remove already selected items 
         $scope.$watchCollection('$select.selected', function(selectedItems){
-          if (!selectedItems) return;
+          if (!selectedItems.length) return;
           var data = ctrl.parserResult.source($scope);
           if (!data) return;
           var filteredItems = data.filter(function(i) {return selectedItems.indexOf(i) < 0;});
           setItemsFn(filteredItems);
+          ctrl.sizeSearchInput();
         });
       }
 
@@ -584,13 +585,11 @@
               result;
           if ($select.multiple){
             var resultMultiple = [];
-            if (inputValue) {
-              for (var j = inputValue.length - 1; j >= 0; j--) {
-                locals = {};
-                locals[$select.parserResult.itemName] = inputValue[j];
-                result = $select.parserResult.modelMapper(scope, locals);
-                resultMultiple.unshift(result);
-              }
+            for (var j = $select.selected.length - 1; j >= 0; j--) {
+              locals = {};
+              locals[$select.parserResult.itemName] = $select.selected[j];
+              result = $select.parserResult.modelMapper(scope, locals);
+              resultMultiple.unshift(result);
             }
             return resultMultiple;
           }else{
@@ -750,10 +749,8 @@
         });
 
         if ($select.multiple){
-          scope.$watchCollection('$select.selected', function(newValue) {
-            //On v1.2.19 the 2nd and 3rd parameteres are ignored
-            //On v1.3.0-beta+ 3rd parameter (revalidate) is true, to force $parsers to recreate model
-            ngModel.$setViewValue(newValue, null, true);
+          scope.$watchCollection('$select.selected', function() {
+            ngModel.$setViewValue(Date.now()); //Set timestamp as a unique string to force changes
           });
           focusser.prop('disabled', true); //Focusser isn't needed if multiple
         }else{

src/select.css

@@ -1371,6 +1371,32 @@ describe('ui-select tests', function() {
 
     });
 
+    it('should change viewvalue only once when updating modelvalue', function () {
+      
+      scope.selection.selectedMultiple = ['[email protected]', '[email protected]'];
+
+      var el = compileTemplate(
+          '<ui-select ng-change="onlyOnce()" multiple ng-model="selection.selectedMultiple" theme="bootstrap" style="width: 800px;"> \
+              <ui-select-match placeholder="Pick one...">{{$item.name}} &lt;{{$item.email}}&gt;</ui-select-match> \
+              <ui-select-choices repeat="person.email as person in people | filter: $select.search"> \
+                <div ng-bind-html="person.name | highlight: $select.search"></div> \
+                <div ng-bind-html="person.email | highlight: $select.search"></div> \
+              </ui-select-choices> \
+          </ui-select> \
+          '
+      );
+
+      scope.counter = 0;
+      scope.onlyOnce = function(){
+        scope.counter++;
+      }
+
+      clickItem(el, 'Nicole');
+
+      expect(scope.counter).toBe(1);
+
+    });
+
   });