Bump version to v2.1.5

patternfly · Jul 13, 2017 · f5e4b92 · f5e4b92
1 parent 5512653
commit f5e4b92
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "patternfly-bootstrap-treeview",
   "description": "Tree View for Twitter Bootstrap",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "homepage": "https://github.com/patternfly/patternfly-bootstrap-treeview",
   "main": "dist/bootstrap-treeview.js",
   "keywords": [

diff --git a/dist/bootstrap-treeview.js b/dist/bootstrap-treeview.js
@@ -1146,6 +1146,11 @@
 				}
 				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"]{' + innerStyle + '}';
 			}
+
+			if (node.iconColor) {
+				var innerStyle = 'color:' + node.iconColor + ';';
+				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"] .node-icon{' + innerStyle + '}';
+			}
 		}, this));
 
 		return this._css + style;

diff --git a/dist/bootstrap-treeview.min.js b/dist/bootstrap-treeview.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "patternfly-bootstrap-treeview",
   "description": "Tree View for Twitter Bootstrap",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "homepage": "https://github.com/patternfly/patternfly-bootstrap-treeview",
   "author": {
     "name": "Red Hat"

diff --git a/public/js/bootstrap-treeview.js b/public/js/bootstrap-treeview.js
@@ -1146,6 +1146,11 @@
 				}
 				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"]{' + innerStyle + '}';
 			}
+
+			if (node.iconColor) {
+				var innerStyle = 'color:' + node.iconColor + ';';
+				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"] .node-icon{' + innerStyle + '}';
+			}
 		}, this));
 
 		return this._css + style;

diff --git a/tests/lib/bootstrap-treeview.js b/tests/lib/bootstrap-treeview.js
@@ -1146,6 +1146,11 @@
 				}
 				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"]{' + innerStyle + '}';
 			}
+
+			if (node.iconColor) {
+				var innerStyle = 'color:' + node.iconColor + ';';
+				style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"] .node-icon{' + innerStyle + '}';
+			}
 		}, this));
 
 		return this._css + style;