Merge pull request #47 from skateman/bump-version

skateman · web-flow · commit 5512653d0368 · 2017-07-12T19:38:05.000+02:00
Bump version to v2.1.4
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.3",
+  "version": "2.1.4",
   "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
@@ -972,11 +972,14 @@
 				node.$el
 					.append(this._template.badge.clone()
 						.addClass(
-							typeof node.tagsClass[id] === 'string' ?
-								node.tagsClass[id] :
-								this._options.tagsClass
+							(typeof tag === 'object' ? tag.class : undefined)
+							|| node.tagsClass
+							|| this._options.tagsClass
+						)
+						.append(
+							(typeof tag === 'object' ? tag.text : undefined)
+							|| tag
 						)
-						.append(tag)
 					);
 			}, this));
 		}
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.3",
+  "version": "2.1.4",
   "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
@@ -972,11 +972,14 @@
 				node.$el
 					.append(this._template.badge.clone()
 						.addClass(
-							typeof node.tagsClass[id] === 'string' ?
-								node.tagsClass[id] :
-								this._options.tagsClass
+							(typeof tag === 'object' ? tag.class : undefined)
+							|| node.tagsClass
+							|| this._options.tagsClass
+						)
+						.append(
+							(typeof tag === 'object' ? tag.text : undefined)
+							|| tag
 						)
-						.append(tag)
 					);
 			}, this));
 		}
diff --git a/tests/lib/bootstrap-treeview.js b/tests/lib/bootstrap-treeview.js
@@ -972,11 +972,14 @@
 				node.$el
 					.append(this._template.badge.clone()
 						.addClass(
-							typeof node.tagsClass[id] === 'string' ?
-								node.tagsClass[id] :
-								this._options.tagsClass
+							(typeof tag === 'object' ? tag.class : undefined)
+							|| node.tagsClass
+							|| this._options.tagsClass
+						)
+						.append(
+							(typeof tag === 'object' ? tag.text : undefined)
+							|| tag
 						)
-						.append(tag)
 					);
 			}, this));
 		}

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.3",`
	`4`	`+ "version": "2.1.4",`
`5`	`5`	`"homepage": "https://github.com/patternfly/patternfly-bootstrap-treeview",`
`6`	`6`	`"main": "dist/bootstrap-treeview.js",`
`7`	`7`	`"keywords": [`