Skip to content

Commit

Permalink
Merge pull request #11 from johnyanarella/master
Browse files Browse the repository at this point in the history
Updated to Polymer 1.7
  • Loading branch information
John Yanarella authored Feb 9, 2017
2 parents 1659fd7 + 90ff87d commit 8943f3d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
23 changes: 9 additions & 14 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "radium-combo",
"version": "0.6.0",
"version": "0.7.0",
"description": "Material Design Dropdown/Typeahead/Combobox control",
"authors": [
"jason gardner <jason.gardner.lv@gmail.com>"
Expand All @@ -24,18 +24,13 @@
"homepage": "https://github.com/jasongardnerlv/radium-combo",
"ignore": [],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.3",
"iron-dropdown": "PolymerElements/iron-dropdown#^1.0.6",
"iron-icon": "PolymerElements/iron-icon#^1.0.7",
"iron-icons": "PolymerElements/iron-icons#^1.0.4",
"iron-selector": "PolymerElements/iron-selector#^1.0.8",
"paper-input": "PolymerElements/paper-input#^1.1.2",
"paper-item": "PolymerElements/paper-item#^1.0.5"
"polymer": "Polymer/polymer#1.7.0",
"iron-dropdown": "PolymerElements/iron-dropdown#1.5.4",
"iron-icon": "PolymerElements/iron-icon#1.0.12",
"iron-icons": "PolymerElements/iron-icons#1.2.0",
"iron-selector": "PolymerElements/iron-selector#1.5.2",
"paper-input": "PolymerElements/paper-input#1.1.22",
"paper-item": "PolymerElements/paper-item#1.2.1"
},
"devDependencies": {
"paper-toggle-button": "PolymerElements/paper-toggle-button#^1.0.11",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"web-component-tester": "Polymer/web-component-tester#^3.3.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0"
}
"devDependencies": {}
}
6 changes: 4 additions & 2 deletions radium-combo.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<iron-icon id="clear-icon" icon="clear" hidden$="[[!_showClearIcon(showClearButton, _inputValue)]]" on-tap="_clearTapped"></iron-icon>
<iron-icon id="dropdown-icon" icon="[[_dropdownIcon(_open)]]"></iron-icon>
</paper-input-container>
<iron-dropdown id="dropdown" no-cancel-on-outside-click no-overlap on-iron-overlay-opened="_dropdownOpened" on-iron-overlay-closed="_dropdownClosed">
<iron-dropdown id="dropdown" no-cancel-on-outside-click on-iron-overlay-opened="_dropdownOpened" on-iron-overlay-closed="_dropdownClosed">
<div class="dropdown-content">
<template is="dom-if" if="[[_checkShowNoMatches(noMatchesLabel, type, _filteredOptions)]]">
<paper-item value="">
Expand Down Expand Up @@ -390,7 +390,7 @@
this._open = false;
},
_clearTapped: function (e) {
e.stopImmediatePropagation();
e.stopPropagation();

this.clearSelection(true);
},
Expand Down Expand Up @@ -420,6 +420,8 @@
}
},
_selectItem: function(e) {
e.stopPropagation();

var item = e.currentTarget;
this.setValue(item.value, true);
this._hideDropdown();
Expand Down

0 comments on commit 8943f3d

Please sign in to comment.