Skip to content

Commit bb32a08

Browse files
TravisCITravisCI
committed
docs(*): new deploy (angular-ui/ui-select@8b47220)
1 parent 61bc59e commit bb32a08

File tree

10 files changed

+143
-91
lines changed

10 files changed

+143
-91
lines changed

‎assets/demo.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ app.controller('DemoCtrl', function ($scope, $http, $timeout, $interval) {
150150
vm.person.selectedValue = vm.peopleObj[3];
151151
vm.person.selectedSingle = 'Samantha';
152152
vm.person.selectedSingleKey = '5';
153+
// To run the demos with a preselected person object, uncomment the line below.
154+
//vm.person.selected = vm.person.selectedValue;
153155

154156
vm.people = [
155157
{ name: 'Adam', email: 'adam@email.com', age: 12, country: 'United States' },
@@ -175,6 +177,7 @@ app.controller('DemoCtrl', function ($scope, $http, $timeout, $interval) {
175177
vm.multipleDemo.selectedPeople2 = vm.multipleDemo.selectedPeople;
176178
vm.multipleDemo.selectedPeopleWithGroupBy = [vm.people[8], vm.people[6]];
177179
vm.multipleDemo.selectedPeopleSimple = ['samantha@email.com','wladimir@email.com'];
180+
vm.multipleDemo.removeSelectIsFalse = [vm.people[2], vm.people[0]];
178181

179182
vm.appendToBodyDemo = {
180183
remainingToggleTime: 0,

‎assets/docs.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ section {
164164
text-shadow: 0 1px 0 rgba(0,0,0,.15);
165165
color: #cdbfe3;
166166
background-color: #563d7c;
167-
background-image: url(header.png);
168167
}
169168

170169
.bs-header a {

‎demo-multiple-selection.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,20 @@ <h3>Array of objects (with groupBy)</h3>
136136
</ui-select>
137137
<p>Selected: {{multipleDemo.selectedPeopleWithGroupBy}}</p>
138138

139+
<hr>
140+
<h3>Disabling instead of removing selected items</h3>
141+
<ui-select multiple ng-model="ctrl.multipleDemo.removeSelectIsFalse" theme="bootstrap" ng-disabled="ctrl.disabled" close-on-select="false" style="width: 800px;" title="Choose a person" remove-selected="false">
142+
<ui-select-match placeholder="Select person...">{{$item.name}} &lt;{{$item.email}}&gt;</ui-select-match>
143+
<ui-select-choices repeat="person in ctrl.people | propsFilter: {name: $select.search, age: $select.search}">
144+
<div ng-bind-html="person.name | highlight: $select.search"></div>
145+
<small>
146+
email: {{person.email}}
147+
age: <span ng-bind-html="''+person.age | highlight: $select.search"></span>
148+
</small>
149+
</ui-select-choices>
150+
</ui-select>
151+
<p>Selected: {{multipleDemo.removeSelectIsFalse}}</p>
152+
139153
<div style="height:500px"></div>
140154
</body>
141155
</html>

‎demo-tagging.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ <h1>Tagging</h1>
7171
<p>Tagging allows the creation of new items not present in the item list</p>
7272

7373
<h3>Simple String Tags <small>(With Custom Tag Label &amp; Sort Enabled)</small></h3>
74-
74+
7575
<ui-select multiple tagging tagging-label="(custom 'new' label)" ng-model="ctrl.multipleDemo.colors" theme="bootstrap" sortable="true" ng-disabled="ctrl.disabled" style="width: 300px;" title="Choose a color">
7676
<ui-select-match placeholder="Select colors...">{{$item}}</ui-select-match>
77-
<ui-select-choices repeat="color in availableColors | filter:$select.search">
77+
<ui-select-choices repeat="color in ctrl.availableColors | filter:$select.search">
7878
{{color}}
7979
</ui-select-choices>
8080
</ui-select>
8181
<p>Selected: {{ctrl.multipleDemo.colors}}</p>
8282
<hr>
8383

8484
<h3>Simple String Tags <small>(Predictive Search Model &amp; No Labels)</small></h3>
85-
85+
8686
<ui-select multiple tagging tagging-label="false" ng-model="ctrl.multipleDemo.colors2" theme="bootstrap" ng-disabled="ctrl.disabled" style="width: 300px;" title="Choose a color">
8787
<ui-select-match placeholder="Select colors...">{{$item}}</ui-select-match>
88-
<ui-select-choices repeat="color in availableColors | filter:$select.search">
88+
<ui-select-choices repeat="color in ctrl.availableColors | filter:$select.search">
8989
{{color}}
9090
</ui-select-choices>
9191
</ui-select>
@@ -142,7 +142,7 @@ <h3>Tagging in Single Select mode</h3>
142142
<h3>Tagging in Single select mode, with simple strings</h3>
143143
<ui-select tagging tagging-label="('new')" ng-model="ctrl.singleDemo.color" theme="bootstrap" style="width: 800px;" title="Choose a color">
144144
<ui-select-match placeholder="Select color...">{{$select.selected}}</ui-select-match>
145-
<ui-select-choices repeat="color in availableColors | filter: $select.search">
145+
<ui-select-choices repeat="color in ctrl.availableColors | filter: $select.search">
146146
<div ng-bind-html="color | highlight: $select.search"></div>
147147
</ui-select-choices>
148148
</ui-select>

‎dist/select.css

Lines changed: 9 additions & 5 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.16.1 - 2016-05-03T11:26:08.525Z
4+
* Version: 0.18.0 - 2016-07-04T12:25:46.218Z
55
* License: MIT
66
*/
77

@@ -54,12 +54,14 @@ body > .select2-container.open {
5454
}
5555

5656
/* Handle up direction Select2 */
57-
.ui-select-container[theme="select2"].direction-up .ui-select-match {
57+
.ui-select-container[theme="select2"].direction-up .ui-select-match,
58+
.ui-select-container.select2.direction-up .ui-select-match {
5859
border-radius: 4px; /* FIXME hardcoded value :-/ */
5960
border-top-left-radius: 0;
6061
border-top-right-radius: 0;
6162
}
62-
.ui-select-container[theme="select2"].direction-up .ui-select-dropdown {
63+
.ui-select-container[theme="select2"].direction-up .ui-select-dropdown,
64+
.ui-select-container.select2.direction-up .ui-select-dropdown {
6365
border-radius: 4px; /* FIXME hardcoded value :-/ */
6466
border-bottom-left-radius: 0;
6567
border-bottom-right-radius: 0;
@@ -71,10 +73,12 @@ body > .select2-container.open {
7173

7274
margin-top: -4px; /* FIXME hardcoded value :-/ */
7375
}
74-
.ui-select-container[theme="select2"].direction-up .ui-select-dropdown .select2-search {
76+
.ui-select-container[theme="select2"].direction-up .ui-select-dropdown .select2-search,
77+
.ui-select-container.select2.direction-up .ui-select-dropdown .select2-search {
7578
margin-top: 4px; /* FIXME hardcoded value :-/ */
7679
}
77-
.ui-select-container[theme="select2"].direction-up.select2-dropdown-open .ui-select-match {
80+
.ui-select-container[theme="select2"].direction-up.select2-dropdown-open .ui-select-match,
81+
.ui-select-container.select2.direction-up.select2-dropdown-open .ui-select-match {
7882
border-bottom-color: #5897fb;
7983
}
8084

0 commit comments

Comments
 (0)