Skip to content

Commit 7d3b7b4

Browse files
author
Ivan Antropov
committed
issue #168 Fixed classnames for avoidance of collisions with bootstrap-select
1 parent 7edde4a commit 7d3b7b4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

less/nya-bs-select.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,12 @@
250250
}
251251
}
252252

253-
.bs-searchbox,
254-
.bs-actionsbox {
253+
.nya-bs-searchbox,
254+
.nya-bs-actionsbox {
255255
padding: 4px 8px;
256256
}
257257

258-
.bs-actionsbox {
258+
.nya-bs-actionsbox {
259259
float: left;
260260
width: 100%;
261261
box-sizing: border-box;
@@ -265,8 +265,8 @@
265265
}
266266
}
267267

268-
.bs-searchbox {
269-
& + .bs-actionsbox {
268+
.nya-bs-searchbox {
269+
& + .nya-bs-actionsbox {
270270
padding: 0 8px 4px;
271271
}
272272

src/nya-bs-select.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
1111

1212
var DROPDOWN_CONTAINER = '<div class="dropdown-menu open"></div>';
1313

14-
var SEARCH_BOX = '<div class="bs-searchbox">' +
14+
var SEARCH_BOX = '<div class="nya-bs-searchbox">' +
1515
'<input type="text" class="form-control">' +
1616
'</div>';
1717

1818
var DROPDOWN_MENU = '<ul class="dropdown-menu inner"></ul>';
1919

2020
var NO_SEARCH_RESULT = '<li class="no-search-result"><span>NO SEARCH RESULT</span></li>';
2121

22-
var ACTIONS_BOX = '<div class="bs-actionsbox">' +
22+
var ACTIONS_BOX = '<div class="nya-bs-actionsbox">' +
2323
'<div class="btn-group btn-group-sm btn-block">' +
2424
'<button type="button" class="actions-btn bs-select-all btn btn-default">SELECT ALL</button>' +
2525
'<button type="button" class="actions-btn bs-deselect-all btn btn-default">DESELECT ALL</button>' +
@@ -184,9 +184,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
184184
var dropdownToggle = jqLite($element[0].querySelector('.dropdown-toggle')),
185185
dropdownContainer = dropdownToggle.next(),
186186
dropdownMenu = jqLite(dropdownContainer[0].querySelector('.dropdown-menu.inner')),
187-
searchBox = jqLite(dropdownContainer[0].querySelector('.bs-searchbox')),
187+
searchBox = jqLite(dropdownContainer[0].querySelector('.nya-bs-searchbox')),
188188
noSearchResult = jqLite(dropdownMenu[0].querySelector('.no-search-result')),
189-
actionsBox = jqLite(dropdownContainer[0].querySelector('.bs-actionsbox'));
189+
actionsBox = jqLite(dropdownContainer[0].querySelector('.nya-bs-actionsbox'));
190190

191191
if(nyaBsSelectCtrl.valueExp) {
192192
valueExpFn = function(scope, locals) {

test/spec/live-search-feature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('features about live search related, etc;', function() {
6666
inputElement.val('o');
6767
inputElement.triggerHandler('input');
6868

69-
selectElement[0].querySelector('.bs-actionsbox .bs-select-all').click();
69+
selectElement[0].querySelector('.nya-bs-actionsbox .bs-select-all').click();
7070

7171
$scope.$digest();
7272

0 commit comments

Comments
 (0)