Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated neon animation, use CSS keyframe animations #137

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
10 changes: 4 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -41,16 +41,15 @@
"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": {
"dependencies": {
"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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">

<!-- Ensure Web Animations polyfill is loaded since neon-animation 2.0 doesn't import it -->
<link rel="import" href="../../neon-animation/web-animations.html">
<link rel="import" href="../paper-menu-button.html">

<custom-style>
Expand Down
54 changes: 7 additions & 47 deletions paper-menu-button.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@
/// <reference path="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.d.ts" />
/// <reference path="../iron-behaviors/iron-control-state.d.ts" />
/// <reference path="../iron-dropdown/iron-dropdown.d.ts" />
/// <reference path="../neon-animation/animations/fade-in-animation.d.ts" />
/// <reference path="../neon-animation/animations/fade-out-animation.d.ts" />
/// <reference path="../paper-styles/default-theme.d.ts" />
/// <reference path="../paper-styles/shadow.d.ts" />
/// <reference path="paper-menu-button-animations.d.ts" />

/**
* Material design: [Dropdown buttons](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
Expand Down Expand Up @@ -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;

Expand All @@ -145,27 +144,14 @@ 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;

/**
* The content element that is contained by the menu button, if any.
*
*/
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.
Expand All @@ -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 {
Expand Down
Loading