Skip to content

Commit

Permalink
Merge pull request #93 from predixdesignsystem/added-read-only-proper…
Browse files Browse the repository at this point in the history
…ty-for-item-list-#79

Added read-only and disabled-viewable properties as described in issue #79
  • Loading branch information
arongraham-ge authored Jan 4, 2019
2 parents e912df5 + 0e3458b commit 6f72e8f
Show file tree
Hide file tree
Showing 13 changed files with 1,516 additions and 866 deletions.
961 changes: 483 additions & 478 deletions HISTORY.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-dropdown",
"version": "4.7.9",
"version": "4.7.10",
"main": [
"px-dropdown.html"
],
Expand Down
4 changes: 3 additions & 1 deletion css/px-dropdown-styles.html

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions demo/simple_demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,63 @@
items='[{"key":"1","val":"test test test test test test test test test test test test test test test test iPhone"},{"key":"2","val":"Android"},{"key":"3","val":"Blackberry"},{"key":"4","val":"I am a menu item so I cannot be selected","disableSelect":true},{"key":"5","val":"Flip Phone","disabled":true}]'>
</px-dropdown>
</br>
<p>Disabled Dropdown</p>
<px-dropdown
id="disabledDropdown"
display-value="Disabled"
hoist
disabled
container-type="disDropdown"
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>
</br>
<p>Disabled Viewable Dropdown</p>
<px-dropdown
id="disabledViewable"
display-value="Disabled Viewable"
hoist
disabled-viewable
container-type="disDropdown"
select-by="key"
selected-values='["1","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>
</br>
<p>Multi Select</p>
<px-dropdown
id="multiSelect"
hoist
container-type="bar"
selected-values='["2","3","5"]'
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>
</br>
<p>Multi Select and Read Only</p>
<px-dropdown
id="multiSelect"
hoist
read-only
container-type="bar"
selected-values='["2","5"]'
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>
</br>
<p>Single Select Read Only</p>
<px-dropdown
id="readOnly"
display-value="Read Only Items"
container-type="readOnly"
read-only items='[{"key":"1","val":"One Read Only"},{"key":"2","val":"Two Read Only"},{"key":"3","val":"Three Read Only","selected":"true"},{"key":"4","val":"Four Read Only","disabled":"true"}]'>
</px-dropdown>
</br>
<p>Disable Select (Like a Menu)</p>
<px-dropdown
id="disableSelect"
display-value="My Menu"
container-type="baz"
items='[{"key":"1","val":"Do something"},{"key":"2","val":"Do something else"},{"key":"3","val":"Do one"}]'
disable-select>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "px-dropdown",
"author": "General Electric",
"description": "A Predix UI Dropdown component",
"version": "4.7.9",
"version": "4.7.10",
"extName": null,
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 6f72e8f

Please sign in to comment.