issue lordfriend#168 Fixed classnames for avoidance of collisions wit…

…h bootstrap-select
iantropov · Aug 26, 2017 · 7d3b7b4 · 7d3b7b4
1 parent 7edde4a
commit 7d3b7b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/less/nya-bs-select.less b/less/nya-bs-select.less
@@ -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;
@@ -265,8 +265,8 @@
     }
   }
 
-  .bs-searchbox {
-    & + .bs-actionsbox {
+  .nya-bs-searchbox {
+    & + .nya-bs-actionsbox {
       padding: 0 8px 4px;
     }
 

diff --git a/src/nya-bs-select.js b/src/nya-bs-select.js
@@ -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>' +
@@ -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) {

diff --git a/test/spec/live-search-feature.js b/test/spec/live-search-feature.js
@@ -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();