update components

This commit is contained in:
Luke Pulverenti 2016-04-10 17:45:06 -04:00
parent 20a9c83bf6
commit 308b423658
5 changed files with 21 additions and 15 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.11", "version": "1.2.12",
"_release": "1.2.11", "_release": "1.2.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.11", "tag": "1.2.12",
"commit": "46578959a8407ba9db7d2ae9b27dfa30a5abe6b3" "commit": "7f5e97c93b067629c7e3d0da3599ec812ad573b4"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -58,7 +58,8 @@ define([], function () {
return elem; return elem;
} }
function isFocusableElementValid(elem) { // Determines if a focusable element can be focused at a given point in time
function isCurrentlyFocusable(elem) {
if (elem.disabled) { if (elem.disabled) {
return false; return false;
@ -84,7 +85,7 @@ define([], function () {
var elem = elems[i]; var elem = elems[i];
if (isFocusableElementValid(elem)) { if (isCurrentlyFocusable(elem)) {
focusableElements.push(elem); focusableElements.push(elem);
} }
} }
@ -203,7 +204,7 @@ define([], function () {
continue; continue;
} }
if (!isFocusableElementValid(curr)) { if (!isCurrentlyFocusable(curr)) {
continue; continue;
} }
@ -480,6 +481,7 @@ define([], function () {
moveDown: function (sourceElement) { moveDown: function (sourceElement) {
nav(sourceElement, 3); nav(sourceElement, 3);
}, },
sendText: sendText sendText: sendText,
isCurrentlyFocusable: isCurrentlyFocusable
}; };
}); });

View file

@ -51,8 +51,12 @@ define(['viewcontainer', 'focusManager', 'queryString', 'connectionManager', 'ev
focusManager.autoFocus(view); focusManager.autoFocus(view);
} }
} }
else if (view.activeElement) { else {
view.activeElement.focus(); if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
focusManager.focus(view.activeElement);
} else {
focusManager.autoFocus(view);
}
} }
view.dispatchEvent(new CustomEvent('viewshow', eventDetail)); view.dispatchEvent(new CustomEvent('viewshow', eventDetail));

View file

@ -45,7 +45,7 @@
"tag": "v1.0.11", "tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
}, },
"_source": "git://github.com/PolymerElements/paper-behaviors.git", "_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors" "_originalSource": "polymerelements/paper-behaviors"
} }

View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple", "homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/PolymerElements/paper-ripple.git", "_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple" "_originalSource": "polymerelements/paper-ripple"
} }