Skip to content
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

issue #168 Fixed classnames for avoidance of collisions with bootstrap-select #174

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue #168 Fixed classnames for avoidance of collisions with bootstrap-select #174

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
10 changes: 5 additions & 5 deletions less/nya-bs-select.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,12 @@
}
}

.bs-searchbox,
.bs-actionsbox {
.nya-bs-searchbox,
.nya-bs-actionsbox {
padding: 4px 8px;
}

.bs-actionsbox {
.nya-bs-actionsbox {
float: left;
width: 100%;
box-sizing: border-box;
Expand All @@ -265,8 +265,8 @@
}
}

.bs-searchbox {
& + .bs-actionsbox {
.nya-bs-searchbox {
& + .nya-bs-actionsbox {
padding: 0 8px 4px;
}

Expand Down
8 changes: 4 additions & 4 deletions src/nya-bs-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi

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

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

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

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

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

if(nyaBsSelectCtrl.valueExp) {
valueExpFn = function(scope, locals) {
Expand Down
2 changes: 1 addition & 1 deletion test/spec/live-search-feature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('features about live search related, etc;', function() {
inputElement.val('o');
inputElement.triggerHandler('input');

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

$scope.$digest();

Expand Down