Skip to content

optimize rendering of drop-down choices by changing how the "null" option is handled (VIV-9227) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2023
Merged

optimize rendering of drop-down choices by changing how the "null" option is handled (VIV-9227) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dist/select.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! ui-select@0.20.1 https://github.com/bdb-opensource/ui-select (MIT License) */
/*! ui-select@0.20.3 https://github.com/bdb-opensource/ui-select (MIT License) */
/* Style when highlighting a search. */
.ui-select-highlight {
font-weight: bold;
Expand Down
88 changes: 32 additions & 56 deletions dist/select.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/select.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/select.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/select.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "git://github.com/angular-ui/ui-select.git"
},
"style": "dist/select.css",
"version": "0.20.1",
"version": "0.20.3",
"devDependencies": {
"angular": "^1.2.18",
"angular-mocks": "^1.2.18",
Expand Down
12 changes: 8 additions & 4 deletions src/bootstrap/choices.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<ul class="ui-select-choices ui-select-choices-content">
<li ng-if="$select.displayNullValue()">
<div ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}--1" class="ui-select-choices-row"
ng-class="{active: $select.activeIndex === -1}" role="option" ng-click="$select.clear($event)">
<span class="ui-select-choices-row-inner" ng-bind="$select.nullLabel"></span>
</div>
</li>
<li class="ui-select-choices-group" id="ui-select-choices-{{ $select.generatedId }}">
<div class="divider" ng-show="$select.isGrouped && $index > 0"></div>
<div ng-show="$select.isGrouped && $group.name" class="ui-select-choices-group-label dropdown-header"
ng-bind="$group.name">
</div>
<div ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}-{{$index}}" class="ui-select-choices-row"
ng-class="{active: $select.isActive(this), disabled: $select.isDisabled(this)}" role="option"
ng-switch="this[$select.itemProperty].$$null">
<span ng-switch-when="true" class="ui-select-choices-row-null" ng-bind="$select.nullLabel"></span>
<span ng-switch-default class="ui-select-choices-row-inner"></span>
ng-class="{active: $select.isActive(this), disabled: $select.isDisabled(this)}" role="option">
<span class="ui-select-choices-row-inner"></span>
</div>
</li>
</ul>
13 changes: 8 additions & 5 deletions src/select2/choices.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<ul tabindex="-1" class="ui-select-choices ui-select-choices-content select2-results">
<li ng-if="$select.displayNullValue()">
<div ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}--1" class="ui-select-choices-row"
ng-class="{active: $select.activeIndex === -1}" role="option" ng-click="$select.clear($event)">
<div class="select2-result-label ui-select-choices-row-inner" ng-bind="$select.nullLabel"></div>
</div>
</li>
<li class="ui-select-choices-group" ng-class="{'select2-result-with-children': $select.choiceGrouped($group)}">
<div ng-show="$select.choiceGrouped($group)" class="ui-select-choices-group-label select2-result-label"
ng-bind="$group.name">
</div>
<ul id="ui-select-choices-{{ $select.generatedId }}"
ng-class="{'select2-result-sub': $select.choiceGrouped($group), 'select2-result-single': !$select.choiceGrouped($group)}">
<li role="option" ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}-{{$index}}" class="ui-select-choices-row"
ng-class="{'select2-highlighted': $select.isActive(this), 'select2-disabled': $select.isDisabled(this)}"
ng-switch="this[$select.itemProperty].$$null">
<div ng-switch-default class="select2-result-label ui-select-choices-row-inner"></div>
<div ng-switch-when="true" class="select2-result-label ui-select-choices-row-null" ng-bind="$select.nullLabel">
</div>
ng-class="{'select2-highlighted': $select.isActive(this), 'select2-disabled': $select.isDisabled(this)}">
<div class="select2-result-label ui-select-choices-row-inner"></div>
</li>
</ul>
</li>
Expand Down
11 changes: 6 additions & 5 deletions src/selectize/choices.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<div class="ui-select-choices">
<div class="ui-select-choices-content selectize-dropdown-content">
<div ng-if="$select.displayNullValue()" ng-attr-id="ui-select-choices-row-{{ $select.generatedId }}--1"
class="ui-select-choices-row" ng-class="{active: $select.activeIndex === -1}" role="option" ng-click="$select.clear($event)">
<div class="option ui-select-choices-row-inner" ng-bind="$select.nullLabel" data-selectable></div>
</div>
<div class="ui-select-choices-group optgroup">
<div ng-show="$select.isGrouped && $group.name" class="ui-select-choices-group-label optgroup-header"
ng-bind="$group.name">
</div>
<div role="option" class="ui-select-choices-row" ng-switch="this[$select.itemProperty].$$null"
ng-class="{active: $select.isActive(this), disabled: $select.isDisabled(this)}">
<div ng-switch-default class="option ui-select-choices-row-inner" data-selectable></div>
<div ng-switch-when="true" class="option ui-select-choices-row-null" data-selectable ng-bind="$select.nullLabel">
</div>
<div role="option" class="ui-select-choices-row" ng-class="{active: $select.isActive(this), disabled: $select.isDisabled(this)}">
<div class="option ui-select-choices-row-inner" data-selectable></div>
</div>
</div>
</div>
Expand Down
Loading