Skip to content

Commit 411982a

Browse files
authored
Merge pull request angular-ui#1 from dankrajnak/master
Upgrading Karma
2 parents aba7f40 + 1e4dd38 commit 411982a

13 files changed

+108
-16
lines changed

dist/select.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* ui-select-bs4
33
* https://github.com/bmontgomery/ui-select
4-
* Version: 0.19.8 - 2017-07-26T13:22:29.868Z
4+
* Version: 0.19.8 - 2018-07-12T14:33:38.275Z
55
* License: MIT
66
*/
77

dist/select.js

+14-8
Large diffs are not rendered by default.

dist/select.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/select.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/select.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/select.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"jquery": "~1.11",
3939
"jshint": "^2.9.1",
4040
"jshint-stylish": "~0.3.0",
41-
"karma": "^0.12.16",
41+
"karma": "^2.0.4",
4242
"karma-chrome-launcher": "^0.1.3",
4343
"karma-coverage": "~0.2",
4444
"karma-firefox-launcher": "~0.1",

src/bootstrap4-1/choices.tpl.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<ul class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu"
2+
ng-show="$select.open && $select.items.length > 0" ng-class="{show: $select.open}">
3+
<li class="ui-select-choices-group" id="ui-select-choices-{{ $select.generatedId }}" >
4+
<div class="divider" ng-show="$select.isGrouped && $index > 0"></div>
5+
<div ng-show="$select.isGrouped" class="ui-select-choices-group-label dropdown-header" ng-bind="$group.name"></div>
6+
<div ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}-{{$index}}" class="ui-select-choices-row"
7+
ng-class="{active: $select.isActive(this), disabled: $select.isDisabled(this)}" role="option">
8+
<span class="ui-select-choices-row-inner"></span>
9+
</div>
10+
</li>
11+
</ul>
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<span class="ui-select-match">
2+
<span ng-repeat="$item in $select.selected track by $index">
3+
<span
4+
class="ui-select-match-item btn btn-outline-secondary btn-xs"
5+
tabindex="-1"
6+
type="button"
7+
ng-disabled="$select.disabled"
8+
ng-click="$selectMultiple.activeMatchIndex = $index;"
9+
ng-class="{'btn-primary':$selectMultiple.activeMatchIndex === $index, 'select-locked':$select.isLocked(this, $index)}"
10+
ui-select-sort="$select.selected">
11+
<span class="close ui-select-match-close" ng-hide="$select.disabled" ng-click="$selectMultiple.removeChoice($index)">&nbsp;&times;</span>
12+
<span uis-transclude-append></span>
13+
</span>
14+
</span>
15+
</span>

src/bootstrap4-1/match.tpl.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<div class="ui-select-match" ng-hide="$select.open && $select.searchEnabled" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">
2+
<span tabindex="-1"
3+
class="btn btn-outline-secondary form-control ui-select-toggle"
4+
aria-label="{{ $select.baseTitle }} activate"
5+
ng-disabled="$select.disabled"
6+
ng-click="$select.activate()"
7+
style="outline: 0;">
8+
<span ng-show="$select.isEmpty()" class="ui-select-placeholder text-muted">{{$select.placeholder}}</span>
9+
<span ng-hide="$select.isEmpty()" class="ui-select-match-text pull-left" ng-class="{'ui-select-allow-clear': $select.allowClear && !$select.isEmpty()}" ng-transclude=""></span>
10+
<i class="caret pull-right" ng-click="$select.toggle($event)"></i>
11+
<a ng-show="$select.allowClear && !$select.isEmpty() && ($select.disabled !== true)" aria-label="{{ $select.baseTitle }} clear" style="margin-right: 10px"
12+
ng-click="$select.clear($event)" class="btn btn-xs btn-link pull-right">
13+
<i class="glyphicon glyphicon-remove" aria-hidden="true"></i>
14+
</a>
15+
</span>
16+
</div>

src/bootstrap4-1/no-choice.tpl.html

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<ul class="ui-select-no-choice dropdown-menu"
2+
ng-show="$select.items.length == 0">
3+
<li ng-transclude>
4+
5+
</li>
6+
</ul>
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<div class="ui-select-container ui-select-multiple ui-select-bootstrap dropdown form-control" ng-class="{open: $select.open}">
2+
<div>
3+
<div class="ui-select-match"></div>
4+
<span ng-show="$select.open && $select.refreshing && $select.spinnerEnabled" class="ui-select-refreshing {{$select.spinnerClass}}"></span>
5+
<input type="search"
6+
autocomplete="off"
7+
autocorrect="off"
8+
autocapitalize="off"
9+
spellcheck="false"
10+
class="ui-select-search input-xs"
11+
placeholder="{{$selectMultiple.getPlaceholder()}}"
12+
ng-disabled="$select.disabled"
13+
ng-click="$select.activate()"
14+
ng-model="$select.search"
15+
role="combobox"
16+
aria-expanded="{{$select.open}}"
17+
aria-label="{{$select.baseTitle}}"
18+
ng-class="{'spinner': $select.refreshing}"
19+
ondrop="return false;">
20+
</div>
21+
<div class="ui-select-choices"></div>
22+
<div class="ui-select-no-choice"></div>
23+
</div>

src/bootstrap4-1/select.tpl.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="ui-select-container ui-select-bootstrap dropdown">
2+
<div class="ui-select-match"></div>
3+
<span ng-show="$select.open && $select.refreshing && $select.spinnerEnabled" class="ui-select-refreshing {{$select.spinnerClass}}"></span>
4+
<input type="search" autocomplete="off" tabindex="-1"
5+
aria-expanded="true"
6+
aria-label="{{ $select.baseTitle }}"
7+
aria-owns="ui-select-choices-{{ $select.generatedId }}"
8+
class="form-control ui-select-search"
9+
ng-class="{ 'ui-select-search-hidden' : !$select.searchEnabled }"
10+
placeholder="{{$select.placeholder}}"
11+
ng-model="$select.search"
12+
ng-show="$select.open">
13+
<div class="ui-select-choices"></div>
14+
<div class="ui-select-no-choice"></div>
15+
</div>

0 commit comments

Comments
 (0)