Merge branch 'master' into allowClear_Fix

Author: Ray Logel

src/bootstrap/match-multiple.tpl.html

@@ -5,10 +5,10 @@
       tabindex="-1"
       type="button"
       ng-disabled="$select.disabled"
-      ng-click="$select.activeMatchIndex = $index;"
-      ng-class="{'btn-primary':$select.activeMatchIndex === $index, 'select-locked':$select.isLocked(this, $index)}"
+      ng-click="$selectMultiple.activeMatchIndex = $index;"
+      ng-class="{'btn-primary':$selectMultiple.activeMatchIndex === $index, 'select-locked':$select.isLocked(this, $index)}"
       ui-select-sort="$select.selected">
-        <span class="close ui-select-match-close" ng-hide="$select.disabled" ng-click="$select.removeChoice($index)">&nbsp;&times;</span>
+        <span class="close ui-select-match-close" ng-hide="$select.disabled" ng-click="$selectMultiple.removeChoice($index)">&nbsp;&times;</span>
         <span uis-transclude-append></span>
     </span>
   </span>

src/bootstrap/select-multiple.tpl.html

@@ -7,7 +7,7 @@
            autocapitalize="off" 
            spellcheck="false" 
            class="ui-select-search input-xs"
-           placeholder="{{$select.getPlaceholder()}}"
+           placeholder="{{$selectMultiple.getPlaceholder()}}"
            ng-disabled="$select.disabled"
            ng-hide="$select.disabled"
            ng-click="$select.activate()"

src/common.css

@@ -100,9 +100,9 @@ body > .select2-container.open {
   border-bottom-right-radius: 0;
 }
 
-.ui-select-bootstrap > .ui-select-match {
+.ui-select-bootstrap > .ui-select-match > .btn{
   /* Instead of center because of .btn */
-  text-align: left;
+  text-align: left !important;
 }
 
 .ui-select-bootstrap > .ui-select-match > .caret {

src/select2/match-multiple.tpl.html

@@ -5,9 +5,9 @@
 -->
 <span class="ui-select-match">
   <li class="ui-select-match-item select2-search-choice" ng-repeat="$item in $select.selected" 
-      ng-class="{'select2-search-choice-focus':$select.activeMatchIndex === $index, 'select2-locked':$select.isLocked(this, $index)}"
+      ng-class="{'select2-search-choice-focus':$selectMultiple.activeMatchIndex === $index, 'select2-locked':$select.isLocked(this, $index)}"
       ui-select-sort="$select.selected">
       <span uis-transclude-append></span>
-      <a href="javascript:;" class="ui-select-match-close select2-search-choice-close" ng-click="$select.removeChoice($index)" tabindex="-1"></a>
+      <a href="javascript:;" class="ui-select-match-close select2-search-choice-close" ng-click="$selectMultiple.removeChoice($index)" tabindex="-1"></a>
   </li>
 </span>

src/select2/match.tpl.html

@@ -5,9 +5,9 @@
 -->
 <a class="select2-choice ui-select-match"
    ng-class="{'select2-default': $select.isEmpty()}"
-   ng-click="$select.activate()" aria-label="{{ $select.baseTitle }} select">
+   ng-click="$select.toggle($event)" aria-label="{{ $select.baseTitle }} select">
   <span ng-show="$select.isEmpty()" class="select2-chosen">{{$select.placeholder}}</span>
   <span ng-hide="$select.isEmpty()" class="select2-chosen" ng-transclude></span>
   <abbr ng-if="$select.allowClear && !$select.isEmpty()" class="select2-search-choice-close" ng-click="$select.clear($event)"></abbr>
-  <span class="select2-arrow ui-select-toggle" ng-click="$select.toggle($event)"><b></b></span>
+  <span class="select2-arrow ui-select-toggle"><b></b></span>
 </a>

src/select2/select-multiple.tpl.html

@@ -16,7 +16,7 @@
         aria-label="{{ $select.baseTitle }}"
         aria-activedescendant="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }}"
         class="select2-input ui-select-search"
-        placeholder="{{$select.getPlaceholder()}}"
+        placeholder="{{$selectMultiple.getPlaceholder()}}"
         ng-disabled="$select.disabled"
         ng-hide="$select.disabled"
         ng-model="$select.search"

src/uiSelectChoicesDirective.js

@@ -1,5 +1,5 @@
 uis.directive('uiSelectChoices',
-  ['uiSelectConfig', 'RepeatParser', 'uiSelectMinErr', '$compile',
+  ['uiSelectConfig', 'uisRepeatParser', 'uiSelectMinErr', '$compile',
   function(uiSelectConfig, RepeatParser, uiSelectMinErr, $compile) {
 
   return {