milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix artist editor

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-06 01:02:05 -04:00
parent 3a5dad0e64
commit 8fc34293c7
16 changed files with 221 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dashboard-ui/bower_components/emby-webcomponents/router.js vendored
View file

@ -1,4 +1,4 @@
define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs', 'appSettings', 'apphost'], function (loading, viewManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost) {
define(['loading', 'dom', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs', 'appSettings', 'apphost'], function (loading, dom, viewManager, skinManager, pluginManager, backdrop, browser, page, appSettings, appHost) {
var embyRouter = {
showLocalLogin: function (apiClient, serverId, manualLogin) {
@ -481,12 +481,26 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
}
}
page.show(path, options);
return new Promise(function (resolve, reject) {
setTimeout(resolve, 500);
resolveOnNextShow = resolve;
page.show(path, options);
});
}
var resolveOnNextShow;
dom.addEventListener(document, 'viewshow', function () {
var resolve = resolveOnNextShow;
if (resolve) {
resolveOnNextShow = null;
resolve();
}
}, {
passive: true,
once: true
});
var currentRouteInfo;
function current() {
return currentRouteInfo ? currentRouteInfo.route : null;