Update to search result options

- Changed default searchResultColor - Tests for searchResultColor + searchResultBackColor options - New hightlightSearchResults option
mmm8955405 · Mar 22, 2015 · 67a97fa · 67a97fa
1 parent 7cb9944
commit 67a97fa
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -233,6 +233,11 @@ String, class name(s).  Default: "glyphicon glyphicon-plus" as defined by [Boots
 
 Sets the icon to be used on an expandable tree node.
 
+### highlightSearchResults
+Boolean.  Default: true
+
+Whether or not to highlight search results.
+
 ### highlightSelected
 Boolean.  Default: true
 
@@ -258,16 +263,26 @@ String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal
 
 Sets the default background color activated when the users cursor hovers over a node.
 
-### selectedColor
-String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: '#FFFFFF'.
+### searchResultBackColor
+String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: undefined, inherits.
+
+Sets the background color of the selected node.
+
+### searchResultColor
+String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: '#D9534F'.
 
 Sets the foreground color of the selected node.
 
 ### selectedBackColor
-String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: '#FFFFFF'.
+String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: '#428bca'.
 
 Sets the background color of the selected node.
 
+### selectedColor
+String, [any legal color value](http://www.w3schools.com/cssref/css_colors_legal.asp).  Default: '#FFFFFF'.
+
+Sets the foreground color of the selected node.
+
 ### showBorder
 Boolean.  Default: true
 

diff --git a/dist/bootstrap-treeview.min.js b/dist/bootstrap-treeview.min.js
diff --git a/public/js/bootstrap-treeview.js b/public/js/bootstrap-treeview.js
@@ -42,11 +42,12 @@
 		onhoverColor: '#F5F5F5',
 		selectedColor: '#FFFFFF',
 		selectedBackColor: '#428bca',
-		searchResultColor: '#E5E313',
+		searchResultColor: '#D9534F',
 		searchResultBackColor: undefined, //'#FFFFFF',
 
 		enableLinks: false,
 		highlightSelected: true,
+		highlightSearchResults: true,
 		showBorder: true,
 		showTags: false,
 		multiSelect: false,
@@ -462,7 +463,7 @@
 		var color = node.color;
 		var backColor = node.backColor;
 
-		if (this.options.highlightSelected && (node.states.selected)) {
+		if (this.options.highlightSelected && node.states.selected) {
 			if (this.options.selectedColor) {
 				color = this.options.selectedColor;
 			}
@@ -471,7 +472,7 @@
 			}
 		}
 
-		if (node.searchResult) {
+		if (this.options.highlightSearchResults && node.searchResult) {
 			if (this.options.searchResultColor) {
 				color = this.options.searchResultColor;
 			}

diff --git a/src/js/bootstrap-treeview.js b/src/js/bootstrap-treeview.js
@@ -42,11 +42,12 @@
 		onhoverColor: '#F5F5F5',
 		selectedColor: '#FFFFFF',
 		selectedBackColor: '#428bca',
-		searchResultColor: '#E5E313',
+		searchResultColor: '#D9534F',
 		searchResultBackColor: undefined, //'#FFFFFF',
 
 		enableLinks: false,
 		highlightSelected: true,
+		highlightSearchResults: true,
 		showBorder: true,
 		showTags: false,
 		multiSelect: false,
@@ -462,7 +463,7 @@
 		var color = node.color;
 		var backColor = node.backColor;
 
-		if (this.options.highlightSelected && (node.states.selected)) {
+		if (this.options.highlightSelected && node.states.selected) {
 			if (this.options.selectedColor) {
 				color = this.options.selectedColor;
 			}
@@ -471,7 +472,7 @@
 			}
 		}
 
-		if (node.searchResult) {
+		if (this.options.highlightSearchResults && node.searchResult) {
 			if (this.options.searchResultColor) {
 				color = this.options.searchResultColor;
 			}

diff --git a/tests/lib/bootstrap-treeview.js b/tests/lib/bootstrap-treeview.js
@@ -42,11 +42,12 @@
 		onhoverColor: '#F5F5F5',
 		selectedColor: '#FFFFFF',
 		selectedBackColor: '#428bca',
-		searchResultColor: '#E5E313',
+		searchResultColor: '#D9534F',
 		searchResultBackColor: undefined, //'#FFFFFF',
 
 		enableLinks: false,
 		highlightSelected: true,
+		highlightSearchResults: true,
 		showBorder: true,
 		showTags: false,
 		multiSelect: false,
@@ -462,7 +463,7 @@
 		var color = node.color;
 		var backColor = node.backColor;
 
-		if (this.options.highlightSelected && (node.states.selected)) {
+		if (this.options.highlightSelected && node.states.selected) {
 			if (this.options.selectedColor) {
 				color = this.options.selectedColor;
 			}
@@ -471,7 +472,7 @@
 			}
 		}
 
-		if (node.searchResult) {
+		if (this.options.highlightSearchResults && node.searchResult) {
 			if (this.options.searchResultColor) {
 				color = this.options.searchResultColor;
 			}

diff --git a/tests/tests.js b/tests/tests.js
@@ -98,8 +98,11 @@
 		equal(options.onhoverColor, '#F5F5F5', 'onhoverColor default ok');
 		equal(options.selectedColor, '#FFFFFF', 'selectedColor default ok');
 		equal(options.selectedBackColor, '#428bca', 'selectedBackColor default ok');
+		equal(options.searchResultColor, '#D9534F', 'searchResultColor default ok');
+		equal(options.searchResultBackColor, undefined, 'searchResultBackColor default ok');
 		equal(options.enableLinks, false, 'enableLinks default ok');
 		equal(options.highlightSelected, true, 'highlightSelected default ok');
+		equal(options.highlightSearchResults, true, 'highlightSearchResults default ok');
 		equal(options.showBorder, true, 'showBorder default ok');
 		equal(options.showTags, false, 'showTags default ok');
 		equal(options.multiSelect, false, 'multiSelect default ok');
@@ -121,8 +124,11 @@
 			onhoverColor: 'orange',
 			selectedColor: 'yellow',
 			selectedBackColor: 'darkorange',
+			searchResultColor: 'yellow',
+			searchResultBackColor: 'darkorange',
 			enableLinks: true,
 			highlightSelected: false,
+			highlightSearchResults: true,
 			showBorder: false,
 			showTags: true,
 			multiSelect: true,
@@ -145,8 +151,11 @@
 		equal(options.onhoverColor, 'orange', 'onhoverColor set ok');
 		equal(options.selectedColor, 'yellow', 'selectedColor set ok');
 		equal(options.selectedBackColor, 'darkorange', 'selectedBackColor set ok');
+		equal(options.searchResultColor, 'yellow', 'searchResultColor set ok');
+		equal(options.searchResultBackColor, 'darkorange', 'searchResultBackColor set ok');
 		equal(options.enableLinks, true, 'enableLinks set ok');
 		equal(options.highlightSelected, false, 'highlightSelected set ok');
+		equal(options.highlightSearchResults, true, 'highlightSearchResults set ok');
 		equal(options.showBorder, false, 'showBorder set ok');
 		equal(options.showTags, true, 'showTags set ok');
 		equal(options.multiSelect, true, 'multiSelect set ok');