Merge pull request #94 from predixdesignsystem/make-display-value-cou…

…nt-a-variable-#69 Make display value count a variable as described in issue #69
predixdesignsystem · Jan 4, 2019 · cc42fe7 · cc42fe7
2 parents 6f72e8f + a03091b
commit cc42fe7
Show file tree

Hide file tree

Showing 10 changed files with 354 additions and 251 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+# v4.8.0
+
+- Added a new property to make the number of selected values used in the trigger label variable.
+- The new property is `display-value-count` and its default value is `1`, which is the current default behaviour.
+
 # v4.7.10
 
 - Added read-only and disabled-viewable properties to px-dropdown.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "px-dropdown",
-  "version": "4.7.10",
+  "version": "4.8.0",
   "main": [
     "px-dropdown.html"
   ],

diff --git a/demo/simple_demo.html b/demo/simple_demo.html
@@ -14,7 +14,7 @@
 limitations under the License.
 -->
 
-  <!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -91,7 +91,9 @@
       hoist
       read-only
       container-type="bar"
-      selected-values='["2","5"]'
+      display-value-count="3"
+      select-by="key"
+      selected-values='["1","2","3"]'
       items='[{"key":"1","val":"iPhone"},{"key":"2","val":"Android"},{"key":"3","val":"Blackberry"},{"key":"4","val":"Windows Windows Windows Windows Windows Windows Windows Phone"},{"key":"5","val":"Flip Phone","disabled":true}]'
       multi>
     </px-dropdown>
@@ -135,16 +137,4 @@
   </div>
 </body>
 
-<script>
-  const foo = document.getElementById('foo');
-
-  foo.addEventListener("px-dropdown-click", evt => {
-    debugger
-    console.log("foo")
-  });
-  window.addEventListener("px-dropdown-click", evt => {
-    console.log("doc")
-  });
-</script>
-
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "px-dropdown",
   "author": "General Electric",
   "description": "A Predix UI Dropdown component",
-  "version": "4.7.10",
+  "version": "4.8.0",
   "extName": null,
   "repository": {
     "type": "git",