Commit 7c22c3b0 authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI: Update Polymer iron-menu-behavior to 2.x.

Bug: 738611
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I11b27ea0e279709382adc4e685cda2bc52c9eb79
Reviewed-on: https://chromium-review.googlesource.com/923413Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537507}
parent 7852f47d
......@@ -21,7 +21,7 @@
"iron-list": "PolymerElements/iron-list#1.4.6",
"iron-location": "PolymerElements/iron-location#2.0.3",
"iron-media-query": "PolymerElements/iron-media-query#2.0.0",
"iron-menu-behavior": "PolymerElements/iron-menu-behavior#1.3.0",
"iron-menu-behavior": "PolymerElements/iron-menu-behavior#2.0.1",
"iron-meta": "PolymerElements/iron-meta#1.1.2",
"iron-overlay-behavior": "PolymerElements/iron-overlay-behavior#2.3.2",
"iron-pages": "PolymerElements/iron-pages#1.0.8",
......
{
"name": "iron-menu-behavior",
"version": "1.3.0",
"version": "2.0.1",
"description": "Provides accessible menu behavior",
"authors": "The Polymer Authors",
"keywords": [
......@@ -22,16 +22,39 @@
"homepage": "https://github.com/PolymerElements/iron-menu-behavior",
"ignore": [],
"dependencies": {
"iron-selector": "PolymerElements/iron-selector#^1.0.0",
"polymer": "Polymer/polymer#^1.2.4",
"iron-a11y-keys-behavior": "polymerelements/iron-a11y-keys-behavior#^1.0.0"
"iron-selector": "PolymerElements/iron-selector#1 - 2",
"polymer": "Polymer/polymer#1.9 - 2",
"iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#1 - 2",
"iron-flex-layout": "PolymerElements/iron-flex-layout#1 - 2"
},
"devDependencies": {
"paper-styles": "polymerelements/paper-styles#^1.0.2",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0",
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
"paper-styles": "PolymerElements/paper-styles#1 - 2",
"iron-component-page": "PolymerElements/iron-component-page#1 - 2",
"iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2",
"web-component-tester": "^6.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
},
"variants": {
"1.x": {
"dependencies": {
"iron-selector": "PolymerElements/iron-selector#^1.0.0",
"polymer": "Polymer/polymer#^1.9",
"iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#^1.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0"
},
"devDependencies": {
"paper-styles": "PolymerElements/paper-styles#^1.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"resolutions": {
"webcomponentsjs": "^0.7"
}
}
},
"resolutions": {
"webcomponentsjs": "^1.0.0"
}
}
......@@ -34,6 +34,26 @@
},
},
// The list of keys has been taken from
// https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/getModifierState
_MODIFIER_KEYS : [
'Alt',
'AltGraph',
'CapsLock',
'Control',
'Fn',
'FnLock',
'Hyper',
'Meta',
'NumLock',
'OS',
'ScrollLock',
'Shift',
'Super',
'Symbol',
'SymbolLock'
],
_SEARCH_RESET_TIMEOUT_MS: 1000,
_previousTabIndex: 0,
......@@ -117,6 +137,12 @@
* @param {KeyboardEvent} event A KeyboardEvent.
*/
_focusWithKeyboardEvent: function(event) {
// Make sure that the key pressed is not a modifier key.
// getModifierState is not being used, as it is not available in Safari
// earlier than 10.0.2 (https://trac.webkit.org/changeset/206725/webkit)
if (this._MODIFIER_KEYS.indexOf(event.key) !== -1)
return;
this.cancelDebouncer('_clearSearchText');
var searchText = this._searchText || '';
......@@ -331,8 +357,10 @@
* @param {CustomEvent} event A key combination event.
*/
_onEscKey: function(event) {
// esc blurs the control
this.focusedItem.blur();
var focusedItem = this.focusedItem;
if (focusedItem) {
focusedItem.blur();
}
},
/**
......
......@@ -114,9 +114,9 @@ Tree link: https://github.com/PolymerElements/iron-media-query/tree/v2.0.0
Name: iron-menu-behavior
Repository: https://github.com/PolymerElements/iron-menu-behavior.git
Tree: v1.3.0
Revision: 707791b8166d9233a582fee5b2df0f6eaea40973
Tree link: https://github.com/PolymerElements/iron-menu-behavior/tree/v1.3.0
Tree: v2.0.1
Revision: cf68d76ebcfebd57d1a73e53c47845a9956506e1
Tree link: https://github.com/PolymerElements/iron-menu-behavior/tree/v2.0.1
Name: iron-meta
Repository: https://github.com/PolymerElements/iron-meta.git
......
......@@ -19,6 +19,7 @@ package-lock.json
*/tests/
.travis.yml
*.d.ts
*wct.conf.json
# app-layout specific
*/patterns/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment