1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-03-03 01:24:46 -05:00
parent 3e622a5069
commit da4fe2588b
3 changed files with 21 additions and 9 deletions

View file

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.1.16",
"_release": "1.1.16",
"version": "1.1.17",
"_release": "1.1.17",
"_resolution": {
"type": "version",
"tag": "1.1.16",
"commit": "61365edb39804806b8af189997ff76bf28bf7dd9"
"tag": "1.1.17",
"commit": "63e912c84d018cb8b6adb6975898d1bde3961b16"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.1.5",

View file

@ -1,4 +1,4 @@
define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'paper-dialog', 'scale-up-animation', 'fade-out-animation', 'fade-in-animation', 'css!./paperdialoghelper.css'], function (historyManager, focusManager, browser, layoutManager) {
define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'paper-dialog', 'scale-up-animation', 'fade-out-animation', 'fade-in-animation', 'css!./paperdialoghelper.css'], function (historyManager, focusManager, browser, layoutManager, inputManager) {
function paperDialogHashHandler(dlg, hash, resolve) {
@ -21,6 +21,15 @@
}
}
function onBackCommand(e) {
inputManager.off(dlg, onBackCommand);
self.closedByBack = true;
dlg.close();
e.preventDefault();
}
function onDialogClosed() {
if (removeScrollLockOnClose) {
@ -28,6 +37,7 @@
}
window.removeEventListener('popstate', onHashChange);
inputManager.off(dlg, onBackCommand);
if (!self.closedByBack && isHistoryEnabled(dlg)) {
var state = history.state || {};
@ -71,6 +81,8 @@
historyManager.pushState({ dialogId: hash }, "Dialog", hash);
window.addEventListener('popstate', onHashChange);
} else {
inputManager.on(dlg, onBackCommand);
}
}
@ -143,7 +155,7 @@
// seeing max call stack size exceeded in the debugger with this
dlg.setAttribute('noAutoFocus', 'noAutoFocus');
var defaultEntryAnimation = browser.animate ? 'scale-up-animation' : 'fade-in-animation';
var defaultEntryAnimation = browser.animate && !browser.mobile ? 'scale-up-animation' : 'fade-in-animation';
dlg.entryAnimation = options.entryAnimation || defaultEntryAnimation;
dlg.exitAnimation = 'fade-out-animation';

View file

@ -31,14 +31,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/polymerelements/iron-icon",
"homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.7",
"_resolution": {
"type": "version",
"tag": "v1.0.7",
"commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381"
},
"_source": "git://github.com/polymerelements/iron-icon.git",
"_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon"
"_originalSource": "PolymerElements/iron-icon"
}