Skip to content

Commit

Permalink
MB-24041: do not upgrade ui-selectize
Browse files Browse the repository at this point in the history
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 <stochmail@gmail.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
  • Loading branch information
pavel-blagodov authored and Michael Wiederhold committed Apr 27, 2017
1 parent 4e4c13e commit 067ded4
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 2,403 deletions.
14 changes: 10 additions & 4 deletions priv/public/ui/app/mn_admin/mn_analytics/mn_analytics.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
theme="selectize"
ng-disabled="disabled"
on-select="analyticsCtl.onSelectBucket($item)">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="name in analyticsCtl.buckets.bucketsNames | filter: $select.search">
<ui-select-match
class="ui-select-match">{{$select.selected}}</ui-select-match>
<ui-select-choices
class="ui-select-choices"
repeat="name in analyticsCtl.buckets.bucketsNames | filter: $select.search">
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
Expand All @@ -26,8 +29,11 @@
theme="selectize"
ng-disabled="disabled"
on-select="analyticsCtl.onSelectNode($item)">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="name in analyticsCtl.nodes.nodesNames | filter: $select.search">
<ui-select-match
class="ui-select-match">{{$select.selected}}</ui-select-match>
<ui-select-choices
class="ui-select-choices"
repeat="name in analyticsCtl.nodes.nodesNames | filter: $select.search">
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
theme="selectize"
on-select="documentsControlCtl.onSelectPageLimits($item)"
class="inline middle cbui narrow">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-match
class="ui-select-match">{{$select.selected}}</ui-select-match>
<ui-select-choices
class="ui-select-choices"
repeat="name in documentsControlCtl.state.pageLimits | filter: $select.search">
<span
class="select-item ellipsis"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
theme="selectize"
style="display: inline-block; vertical-align: middle;"
class="cbui">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="name in documentsCtl.state.bucketsNames | filter: $select.search">
<ui-select-match
class="ui-select-match">{{$select.selected}}</ui-select-match>
<ui-select-choices
class="ui-select-choices"
repeat="name in documentsCtl.state.bucketsNames | filter: $select.search">
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@
on-select="viewsCtl.onSelectBucket($item)"
theme="selectize"
class="inline">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="name in viewsCtl.state.bucketsNames | filter: $select.search">
<ui-select-match
class="ui-select-match">{{$select.selected}}</ui-select-match>
<ui-select-choices
class="ui-select-choices"
repeat="name in viewsCtl.state.bucketsNames | filter: $select.search">
<span class="select-item ellipsis" ng-bind-html="name | highlight: $select.search" ></span>
</ui-select-choices>
</ui-select>
Expand Down
2 changes: 1 addition & 1 deletion priv/public/ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<script src="libs/angular-uib-position.js"></script>
<script src="libs/angular-uib-tooltip.js"></script>
<script src="libs/angular-uib-spock.js"></script>
<script src="libs/angular-ui-select-0.19.5.js"></script>
<script src="libs/angular-ui-select.js"></script>
<script src="libs/angular-ui-codemirror.js"></script>
<script src="libs/clipboard.js"></script>
<script src="libs/ngclipboard.js"></script>
Expand Down
Loading

0 comments on commit 067ded4

Please sign in to comment.