Skip to content

Commit 067ded4

Browse files
pavel-blagodovMichael Wiederhold
authored and
Michael Wiederhold
committed
MB-24041: do not upgrade ui-selectize
ui-select v0.19.5 has issues with ngAnimate angular-ui/ui-select#224 Here is workaround https://github.com/angular-ui/ui-select/ issues/1325#issuecomment-160922087 to run current ui-select with new angular version. Add class to ui-select-match and ui-select-choices with the same name. Change-Id: Ifd6103afcfa6704daaa8335cce6d52ab4bcd3208 Reviewed-on: http://review.couchbase.org/77239 Tested-by: Pavel Blagodov <[email protected]> Reviewed-by: Michael Wiederhold <[email protected]>
1 parent 4e4c13e commit 067ded4

File tree

6 files changed

+24
-2403
lines changed

6 files changed

+24
-2403
lines changed

priv/public/ui/app/mn_admin/mn_analytics/mn_analytics.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
theme="selectize"
1414
ng-disabled="disabled"
1515
on-select="analyticsCtl.onSelectBucket($item)">
16-
<ui-select-match>{{$select.selected}}</ui-select-match>
17-
<ui-select-choices repeat="name in analyticsCtl.buckets.bucketsNames | filter: $select.search">
16+
<ui-select-match
17+
class="ui-select-match">{{$select.selected}}</ui-select-match>
18+
<ui-select-choices
19+
class="ui-select-choices"
20+
repeat="name in analyticsCtl.buckets.bucketsNames | filter: $select.search">
1821
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
1922
</ui-select-choices>
2023
</ui-select>
@@ -26,8 +29,11 @@
2629
theme="selectize"
2730
ng-disabled="disabled"
2831
on-select="analyticsCtl.onSelectNode($item)">
29-
<ui-select-match>{{$select.selected}}</ui-select-match>
30-
<ui-select-choices repeat="name in analyticsCtl.nodes.nodesNames | filter: $select.search">
32+
<ui-select-match
33+
class="ui-select-match">{{$select.selected}}</ui-select-match>
34+
<ui-select-choices
35+
class="ui-select-choices"
36+
repeat="name in analyticsCtl.nodes.nodesNames | filter: $select.search">
3137
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
3238
</ui-select-choices>
3339
</ui-select>

priv/public/ui/app/mn_admin/mn_documents/list/mn_documents_control.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
theme="selectize"
1717
on-select="documentsControlCtl.onSelectPageLimits($item)"
1818
class="inline middle cbui narrow">
19-
<ui-select-match>{{$select.selected}}</ui-select-match>
19+
<ui-select-match
20+
class="ui-select-match">{{$select.selected}}</ui-select-match>
2021
<ui-select-choices
22+
class="ui-select-choices"
2123
repeat="name in documentsControlCtl.state.pageLimits | filter: $select.search">
2224
<span
2325
class="select-item ellipsis"

priv/public/ui/app/mn_admin/mn_documents/list/mn_documents_list.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
theme="selectize"
1515
style="display: inline-block; vertical-align: middle;"
1616
class="cbui">
17-
<ui-select-match>{{$select.selected}}</ui-select-match>
18-
<ui-select-choices repeat="name in documentsCtl.state.bucketsNames | filter: $select.search">
17+
<ui-select-match
18+
class="ui-select-match">{{$select.selected}}</ui-select-match>
19+
<ui-select-choices
20+
class="ui-select-choices"
21+
repeat="name in documentsCtl.state.bucketsNames | filter: $select.search">
1922
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
2023
</ui-select-choices>
2124
</ui-select>

priv/public/ui/app/mn_admin/mn_indexes/mn_views/list/mn_views_list.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
on-select="viewsCtl.onSelectBucket($item)"
1919
theme="selectize"
2020
class="inline">
21-
<ui-select-match>{{$select.selected}}</ui-select-match>
22-
<ui-select-choices repeat="name in viewsCtl.state.bucketsNames | filter: $select.search">
21+
<ui-select-match
22+
class="ui-select-match">{{$select.selected}}</ui-select-match>
23+
<ui-select-choices
24+
class="ui-select-choices"
25+
repeat="name in viewsCtl.state.bucketsNames | filter: $select.search">
2326
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search" ></span>
2427
</ui-select-choices>
2528
</ui-select>

priv/public/ui/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<script src="libs/angular-uib-position.js"></script>
4545
<script src="libs/angular-uib-tooltip.js"></script>
4646
<script src="libs/angular-uib-spock.js"></script>
47-
<script src="libs/angular-ui-select-0.19.5.js"></script>
47+
<script src="libs/angular-ui-select.js"></script>
4848
<script src="libs/angular-ui-codemirror.js"></script>
4949
<script src="libs/clipboard.js"></script>
5050
<script src="libs/ngclipboard.js"></script>

0 commit comments

Comments
 (0)