Skip to content

Commit 88b8ef7

Browse files
TravisCITravisCI
committed
docs(*): new deploy (angular-ui/ui-select@27b9a17)
1 parent c1e2418 commit 88b8ef7

12 files changed

+147
-38
lines changed

‎demo-append-to-body.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ <h3>Bootstrap theme</h3>
8282
append-to-body="true">
8383
<ui-select-match placeholder="Enter an address...">{{$select.selected.formatted_address}}</ui-select-match>
8484
<ui-select-choices repeat="address in ctrl.addresses track by $index"
85-
refresh="refreshAddresses($select.search)"
85+
refresh="ctrl.refreshAddresses($select.search)"
8686
refresh-delay="0">
87-
<div ng-bind-html="ctrl.address.formatted_address | highlight: $select.search"></div>
87+
<div ng-bind-html="address.formatted_address | highlight: $select.search"></div>
8888
</ui-select-choices>
8989
</ui-select>
9090
<p class="alert alert-info positioned">The select dropdown menu should be displayed above this element.</p>

‎demo-basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h3>Bootstrap theme <small>(remote data source)</small></h3>
7676
title="Choose an address">
7777
<ui-select-match placeholder="Enter an address...">{{$select.selected.formatted_address}}</ui-select-match>
7878
<ui-select-choices repeat="address in ctrl.addresses track by $index"
79-
refresh="refreshAddresses($select.search)"
79+
refresh="ctrl.refreshAddresses($select.search)"
8080
refresh-delay="0">
8181
<div ng-bind-html="address.formatted_address | highlight: $select.search"></div>
8282
</ui-select-choices>

‎demo-multiple-selection.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h1>Multiple Selection</h1>
7171
<h3>Array of strings</h3>
7272
<ui-select multiple ng-model="ctrl.multipleDemo.colors" theme="bootstrap" ng-disabled="ctrl.disabled" close-on-select="false" style="width: 300px;" title="Choose a color">
7373
<ui-select-match placeholder="Select colors...">{{$item}}</ui-select-match>
74-
<ui-select-choices repeat="color in availableColors | filter:$select.search">
74+
<ui-select-choices repeat="color in ctrl.availableColors | filter:$select.search">
7575
{{color}}
7676
</ui-select-choices>
7777
</ui-select>

‎demo-object-as-source.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ <h3>Using value for binding</h3>
7575
<p>Selected: <code>{{ctrl.person.selectedValue}}</code></p>
7676
<ui-select ng-model="ctrl.person.selectedValue" theme="select2" ng-disabled="ctrl.disabled" style="min-width: 300px;" title="Choose a person">
7777
<ui-select-match placeholder="Select a person in the list or search his name/age...">{{$select.selected.value.name}}</ui-select-match>
78-
<ui-select-choices repeat="person.value as (key, person) in ctrl.peopleObj | filter: {'value':$select.search}">
78+
<ui-select-choices repeat="person.value as (key, person) in ctrl.peopleObj | filter: { value : { name: $select.search }}">
7979
<div ng-bind-html="person.value.name | highlight: $select.search"></div>
8080
<small>
8181
email: {{person.value.email}}
@@ -88,7 +88,7 @@ <h3>Using single property for binding</h3>
8888
<p>Selected: <code>{{ctrl.person.selectedSingle}}</code></p>
8989
<ui-select ng-model="ctrl.person.selectedSingle" theme="select2" ng-disabled="ctrl.disabled" style="min-width: 300px;" title="Choose a person">
9090
<ui-select-match placeholder="Select a person in the list or search his name/age...">{{$select.selected.value.name}}</ui-select-match>
91-
<ui-select-choices repeat="person.value.name as (key, person) in ctrl.peopleObj | filter: {'value':$select.search}">
91+
<ui-select-choices repeat="person.value.name as (key, person) in ctrl.peopleObj | filter: { value : { name: $select.search }}">
9292
<div ng-bind-html="person.value.name | highlight: $select.search"></div>
9393
<small>
9494
email: {{person.value.email}}
@@ -101,7 +101,7 @@ <h3>Using key for binding</h3>
101101
<p>Selected: <code>{{ctrl.person.selectedSingleKey}}</code></p>
102102
<ui-select ng-model="ctrl.person.selectedSingleKey" theme="select2" ng-disabled="ctrl.disabled" style="min-width: 300px;" title="Choose a person">
103103
<ui-select-match placeholder="Select a person in the list or search his name/age...">{{$select.selected.value.name}}</ui-select-match>
104-
<ui-select-choices repeat="person.key as (key, person) in ctrl.peopleObj | filter: {'value':$select.search}">
104+
<ui-select-choices repeat="person.key as (key, person) in ctrl.peopleObj | filter: { value : { name: $select.search }}">
105105
<div ng-bind-html="person.value.name | highlight: $select.search"></div>
106106
<small>
107107
email: {{person.value.email}}

‎demo-selectize-with-bootstrap.html

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
.input-group > .selectize-control > .selectize-input {
8181
border-bottom-right-radius: 0;
8282
border-top-right-radius: 0;
83-
}
84-
</style>
83+
}
84+
</style>
8585
<p>Selected: {{ctrl.person.selected.name}}</p>
8686

8787
<form class="form-horizontal">
@@ -141,6 +141,21 @@
141141
</div>
142142
</div>
143143

144+
<div class="form-group">
145+
<label class="col-sm-3 control-label">Multiple</label>
146+
<div class="col-sm-6">
147+
148+
<ui-select ng-model="ctrl.person.selected" multiple theme="selectize" title="Choose a person">
149+
<ui-select-match placeholder="Select or search a person in the list...">{{$item.name}}</ui-select-match>
150+
<ui-select-choices repeat="item in ctrl.people | filter: $select.search">
151+
<div ng-bind-html="item.name | highlight: $select.search"></div>
152+
<small ng-bind-html="item.email | highlight: $select.search"></small>
153+
</ui-select-choices>
154+
</ui-select>
155+
156+
</div>
157+
</div>
158+
144159
<div class="form-group">
145160
<label class="col-sm-3 control-label">Disabled</label>
146161
<div class="col-sm-6">

‎dist/select.css

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* ui-select
33
* http://github.com/angular-ui/ui-select
4-
* Version: 0.19.3 - 2016-08-17T06:24:46.066Z
4+
* Version: 0.20.0 - 2016-10-19T19:45:05.409Z
55
* License: MIT
66
*/
77

@@ -100,10 +100,15 @@ body > .select2-container.open {
100100
}
101101

102102
/* Fix input width for Selectize theme */
103-
.selectize-control > .selectize-input > input {
103+
.selectize-control.single > .selectize-input > input {
104104
width: 100%;
105105
}
106106

107+
/* Fix line break when there's at least one item selected with the Selectize theme */
108+
.selectize-control.multi > .selectize-input > input {
109+
margin: 0 !important;
110+
}
111+
107112
/* Fix dropdown width for Selectize theme */
108113
.selectize-control > .selectize-dropdown {
109114
width: 100%;
@@ -317,4 +322,48 @@ body > .ui-select-bootstrap.open {
317322
height: 10px;
318323
right: 10px;
319324
margin-top: -2px;
320-
}
325+
}
326+
327+
/* Spinner */
328+
.ui-select-refreshing {
329+
position: absolute;
330+
right: 0;
331+
padding: 8px 27px;
332+
top: 1px;
333+
display: inline-block;
334+
font-family: 'Glyphicons Halflings';
335+
font-style: normal;
336+
font-weight: normal;
337+
line-height: 1;
338+
-webkit-font-smoothing:antialiased;
339+
}
340+
341+
@-webkit-keyframes ui-select-spin {
342+
0% {
343+
-webkit-transform: rotate(0deg);
344+
transform: rotate(0deg);
345+
}
346+
100% {
347+
-webkit-transform: rotate(359deg);
348+
transform: rotate(359deg);
349+
}
350+
}
351+
@keyframes ui-select-spin {
352+
0% {
353+
-webkit-transform: rotate(0deg);
354+
transform: rotate(0deg);
355+
}
356+
100% {
357+
-webkit-transform: rotate(359deg);
358+
transform: rotate(359deg);
359+
}
360+
}
361+
362+
.ui-select-spin {
363+
-webkit-animation: ui-select-spin 2s infinite linear;
364+
animation: ui-select-spin 2s infinite linear;
365+
}
366+
367+
.ui-select-refreshing.ng-animate {
368+
-webkit-animation: none 0s;
369+
}

0 commit comments

Comments
 (0)