Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

chore(refactor): split code into multiple directives #731

Merged
merged 1 commit into from
Mar 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/bootstrap/match-multiple.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/select-multiple.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
Expand Down
4 changes: 2 additions & 2 deletions src/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ body > .select2-container {
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 {
Expand Down
4 changes: 2 additions & 2 deletions src/select2/match-multiple.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/select2/select-multiple.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/uiSelectChoicesDirective.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
uis.directive('uiSelectChoices',
['uiSelectConfig', 'RepeatParser', 'uiSelectMinErr', '$compile',
['uiSelectConfig', 'uisRepeatParser', 'uiSelectMinErr', '$compile',
function(uiSelectConfig, RepeatParser, uiSelectMinErr, $compile) {

return {
Expand Down
Loading