Merge pull request #48 from skateman/bump-v2.1.5

skateman · web-flow · commit c8f1603317c3 · 2017-07-13T11:26:03.000+02:00
Bump version to v2.1.5
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;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "patternfly-bootstrap-treeview",`
`3`	`3`	`"description": "Tree View for Twitter Bootstrap",`
`4`		`- "version": "2.1.4",`
	`4`	`+ "version": "2.1.5",`
`5`	`5`	`"homepage": "https://github.com/patternfly/patternfly-bootstrap-treeview",`
`6`	`6`	`"main": "dist/bootstrap-treeview.js",`
`7`	`7`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -1146,6 +1146,11 @@`
`1146`	`1146`	`}`
`1147`	`1147`	`style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"]{' + innerStyle + '}';`
`1148`	`1148`	`}`
	`1149`	`+`
	`1150`	`+ if (node.iconColor) {`
	`1151`	`+ var innerStyle = 'color:' + node.iconColor + ';';`
	`1152`	`+ style += '.node-' + this._elementId + '[data-nodeId="' + node.nodeId + '"] .node-icon{' + innerStyle + '}';`
	`1153`	`+ }`
`1149`	`1154`	`}, this));`
`1150`	`1155`
`1151`	`1156`	`return this._css + style;`