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

switch paperDialogHashHandler from hashchange to pushstate

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-08 15:42:08 -05:00
parent 35a8a1611a
commit 00b18fdc5f
3 changed files with 80 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

64
dashboard-ui/components/paperdialoghelper.js
View file

@ -2,18 +2,21 @@
function paperDialogHashHandler(dlg, hash, resolve, lockDocumentScroll) {
var self = this;
self.originalUrl = window.location.href;
var activeElement = document.activeElement;
function onHashChange(e) {
var data = e.detail.state || {};
var isActive = data.hash == '#' + hash;
var isBack = self.originalUrl == window.location.href;
if (data.direction == 'back') {
if (dlg) {
if (!isActive) {
if (isBack || !dlg.opened) {
window.removeEventListener('popstate', onHashChange);
}
if (isBack) {
self.closedByBack = true;
dlg.close();
dlg = null;
}
}
}
}
@ -23,14 +26,29 @@
Dashboard.onPopupClose();
}
dlg = null;
if (enableHashChange()) {
window.removeEventListener('navigate', onHashChange);
window.removeEventListener('popstate', onHashChange);
if (window.location.hash == '#' + hash) {
if (!self.closedByBack) {
var state = history.state || {};
if (state.dialogId == hash) {
history.back();
}
}
activeElement.focus();
if (dlg.getAttribute('data-removeonclose') == 'true') {
dlg.parentNode.removeChild(dlg);
}
//resolve();
// if we just called history.back(), then use a timeout to allow the history events to fire first
setTimeout(function () {
resolve({
element: dlg,
closedByBack: self.closedByBack
});
}, 1);
}
dlg.addEventListener('iron-overlay-closed', onDialogClosed);
@ -40,23 +58,15 @@
Dashboard.onPopupOpen();
}
if (enableHashChange()) {
var state = {
dialogId: hash,
navigate: false
};
history.pushState(state, "Dialog", hash);
window.location.hash = hash;
jQuery.onStatePushed(state);
window.addEventListener('navigate', onHashChange);
}
}
function enableHashChange() {
// It's not firing popstate in response to hashbang changes
if (browserInfo.msie) {
return false;
}
if (browserInfo.edge) {
return false;
}
return true;
window.addEventListener('popstate', onHashChange);
}
function open(dlg) {

2
dashboard-ui/scripts/site.js
View file

@ -457,6 +457,7 @@ var Dashboard = {
// This is just an attempt to prevent the fade-in animation from running repeating and causing flickering
elem.active = true;
elem.classList.remove('hide');
} else {
@ -479,6 +480,7 @@ var Dashboard = {
if (elem) {
elem.active = false;
elem.classList.add('hide');
}
},

36
dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js vendored
View file

@ -85,11 +85,30 @@
})(jQuery, this);
window.addEventListener('popstate', function (event) {
var previousState = {};
// This is just a temporary api until jquery mobile is eventually deprecated and we have an actual routing library
jQuery.onStatePushed = function(state) {
previousState = state;
};
function ignorePopState(event) {
var state = event.state || {};
setTimeout(function () {
if (previousState.navigate === false) {
// Ignore
previousState = state;
return true;
}
previousState = state;
return false;
}
function fireNavigateFromPopstateEvent(event) {
var state = event.state || {};
if (event.historyState) {
$.extend(state, event.historyState);
}
@ -100,8 +119,7 @@
originalEvent: event
}
}));
}, 0);
});
}
jQuery.mobile.widgets = {};
@ -785,8 +803,16 @@
// TODO grab the original event here and use it for the synthetic event in the
// second half of the navigate execution that will follow this binding
popstate: function (event) {
var hash, state;
if (ignorePopState(event)) {
return;
}
setTimeout(function () {
fireNavigateFromPopstateEvent(event);
}, 0);
var hash, state;
// If this is the popstate triggered by the actual alteration of the hash
// prevent it completely. History is tracked manually
if (this.preventHashAssignPopState) {