diff --git a/bower.json b/bower.json index 5dc8128..6a4e045 100644 --- a/bower.json +++ b/bower.json @@ -24,7 +24,7 @@ "polymer": "Polymer/polymer#1.9 - 2", "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#1 - 2", "iron-behaviors": "PolymerElements/iron-behaviors#1 - 2", - "iron-dropdown": "PolymerElements/iron-dropdown#1 - 2", + "iron-dropdown": "PolymerElements/iron-dropdown#no-neon-animation", "iron-fit-behavior": "PolymerElements/iron-fit-behavior#1 - 2", "neon-animation": "PolymerElements/neon-animation#1 - 2", "paper-styles": "PolymerElements/paper-styles#1 - 2" @@ -41,8 +41,7 @@ "paper-item": "PolymerElements/paper-item#1 - 2", "paper-listbox": "PolymerElements/paper-listbox#1 - 2", "web-component-tester": "^6.0.0", - "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", - "web-animations-js": "web-animations/web-animations-js#^2.2" + "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0" }, "variants": { "1.x": { @@ -50,7 +49,7 @@ "polymer": "Polymer/polymer#^1.9", "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#^1.0.0", "iron-behaviors": "PolymerElements/iron-behaviors#^1.0.0", - "iron-dropdown": "PolymerElements/iron-dropdown#^1.0.0", + "iron-dropdown": "PolymerElements/iron-dropdown#no-neon-animation", "iron-fit-behavior": "PolymerElements/iron-fit-behavior#^1.2.0", "neon-animation": "PolymerElements/neon-animation#^1.0.0", "paper-styles": "PolymerElements/paper-styles#^1.0.0" @@ -67,8 +66,7 @@ "paper-item": "PolymerElements/paper-item#^1.0.0", "paper-listbox": "PolymerElements/paper-listbox#^1.0.0", "web-component-tester": "^4.0.0", - "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", - "web-animations-js": "web-animations/web-animations-js#^2.2" + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "resolutions": { "webcomponentsjs": "^0.7" diff --git a/demo/index.html b/demo/index.html index d00dd45..bd5ab7c 100644 --- a/demo/index.html +++ b/demo/index.html @@ -31,8 +31,6 @@ - - diff --git a/paper-menu-button.d.ts b/paper-menu-button.d.ts index f9f4c1d..905f1ac 100644 --- a/paper-menu-button.d.ts +++ b/paper-menu-button.d.ts @@ -12,11 +12,8 @@ /// /// /// -/// -/// /// /// -/// /** * Material design: [Dropdown buttons](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons) @@ -122,14 +119,16 @@ declare class PaperMenuButton extends Polymer.Element { closeOnActivate: boolean|null|undefined; /** - * An animation config. If provided, this will be used to animate the - * opening of the dropdown. + * Deprecated, setting it won't have effects on the animation. + * `iron-dropdown` doesn't depend anymore on `neon-animation`, and this property is kept + * here to not break bindings. */ openAnimationConfig: object|null|undefined; /** - * An animation config. If provided, this will be used to animate the - * closing of the dropdown. + * Deprecated, setting it won't have effects on the animation. + * `iron-dropdown` doesn't depend anymore on `neon-animation`, and this property is kept + * here to not break bindings. */ closeAnimationConfig: object|null|undefined; @@ -145,12 +144,6 @@ declare class PaperMenuButton extends Polymer.Element { * Whether focus should be restored to the button when the menu closes. */ restoreFocusOnClose: boolean|null|undefined; - - /** - * This is the element intended to be bound as the focus target - * for the `iron-dropdown` contained by `paper-menu-button`. - */ - _dropdownContent: object|null|undefined; hostAttributes: object|null; /** @@ -158,14 +151,7 @@ declare class PaperMenuButton extends Polymer.Element { * */ readonly contentElement: any; - - /** - * If the dropdown is open when disabled becomes true, close the - * dropdown. - * - * @param disabled True if disabled, otherwise false. - */ - _disabledChanged(disabled: boolean): void; + ready(): void; /** * Toggles the drowpdown content between opened and closed. @@ -182,32 +168,6 @@ declare class PaperMenuButton extends Polymer.Element { * Hide the dropdown content. */ close(): void; - - /** - * When an `iron-select` event is received, the dropdown should - * automatically close on the assumption that a value has been chosen. - * - * @param event A CustomEvent instance with type - * set to `"iron-select"`. - */ - _onIronSelect(event: CustomEvent|null): void; - - /** - * Closes the dropdown when an `iron-activate` event is received if - * `closeOnActivate` is true. - * - * @param event A CustomEvent of type 'iron-activate'. - */ - _onIronActivate(event: CustomEvent|null): void; - - /** - * When the dropdown opens, the `paper-menu-button` fires `paper-open`. - * When the dropdown closes, the `paper-menu-button` fires `paper-close`. - * - * @param opened True if the dropdown is opened, otherwise false. - * @param oldOpened The previous value of `opened`. - */ - _openedChanged(opened: boolean, oldOpened: boolean): void; } interface PaperMenuButton extends Polymer.IronA11yKeysBehavior, Polymer.IronControlState { diff --git a/paper-menu-button.html b/paper-menu-button.html index f4c1503..de23a35 100644 --- a/paper-menu-button.html +++ b/paper-menu-button.html @@ -12,11 +12,8 @@ - - -