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

update events

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-27 09:41:19 -05:00
parent e4e6f27f87
commit d2d9f83bcd
3 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/scripts/librarymenu.js
View file

@ -1061,8 +1061,9 @@ $.fn.createHoverTouch = function () {
var isCurrentNavBack = false; var isCurrentNavBack = false;
$(window).on("navigate", function (e, data) { window.addEventListener("navigate", function (e) {
data = data.state || {};
var data = e.detail.state || {};
isCurrentNavBack = data.direction == 'back'; isCurrentNavBack = data.direction == 'back';
}); });

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

@ -2472,10 +2472,9 @@ var AppInfo = {};
function pageClassOn(eventName, className, fn) { function pageClassOn(eventName, className, fn) {
$(document).on(eventName, function (e) { document.addEventListener(eventName, function (e) {
var target = e.target; var target = e.target;
if (target.classList.contains(className)) { if (target.classList.contains(className)) {
fn.call(target, e); fn.call(target, e);
} }
@ -2484,10 +2483,9 @@ function pageClassOn(eventName, className, fn) {
function pageIdOn(eventName, id, fn) { function pageIdOn(eventName, id, fn) {
$(document).on(eventName, function (e) { document.addEventListener(eventName, function (e) {
var target = e.target; var target = e.target;
if (target.id == id) { if (target.id == id) {
fn.call(target, e); fn.call(target, e);
} }

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

@ -298,7 +298,7 @@
if (hash !== last_hash) { if (hash !== last_hash) {
history_set(last_hash = hash, history_hash); history_set(last_hash = hash, history_hash);
$(window).trigger(str_hashchange); window.dispatchEvent(new CustomEvent(str_hashchange, {}));
} else if (history_hash !== last_hash) { } else if (history_hash !== last_hash) {
location.href = location.href.replace(/#.*/, '') + history_hash; location.href = location.href.replace(/#.*/, '') + history_hash;
@ -907,22 +907,19 @@
}, },
hashchange: function (event /*, data */) { hashchange: function (event /*, data */) {
var newEvent = new $.Event("navigate");
// Make sure the original event is tracked for the end
// user to inspect incase they want to do something special
newEvent.originalEvent = event;
// Trigger the hashchange with state provided by the user // Trigger the hashchange with state provided by the user
// that altered the hash // that altered the hash
$win.trigger(newEvent, { window.dispatchEvent(new CustomEvent("navigate", {
detail: {
// Users that want to fully normalize the two events // Users that want to fully normalize the two events
// will need to do history management down the stack and // will need to do history management down the stack and
// add the state to the event before this binding is fired // add the state to the event before this binding is fired
// TODO consider allowing for the explicit addition of callbacks // TODO consider allowing for the explicit addition of callbacks
// to be fired before this value is set to avoid event timing issues // to be fired before this value is set to avoid event timing issues
state: event.hashchangeState || {} state: event.hashchangeState || {}
}); }
}));
}, },
// TODO We really only want to set this up once // TODO We really only want to set this up once
@ -1516,7 +1513,15 @@
} }
} }
this.element.trigger(event, data); this.element[0].dispatchEvent(new CustomEvent(event.type, {
bubbles: true,
detail: {
data: data,
originalEvent: event
}
}));
//this.element.trigger(event, data);
return !($.isFunction(callback) && return !($.isFunction(callback) &&
callback.apply(this.element[0], [event].concat(data)) === false || callback.apply(this.element[0], [event].concat(data)) === false ||
event.isDefaultPrevented()); event.isDefaultPrevented());
@ -2913,11 +2918,19 @@
newEvent = $.Event(this.widgetName + name); newEvent = $.Event(this.widgetName + name);
// DEPRECATED // DEPRECATED
// trigger the old deprecated event on the page if it's provided // trigger the old deprecated event on the page if it's provided
(page || this.element).trigger(deprecatedEvent, data); //(page || this.element).trigger(deprecatedEvent, data);
(page || this.element)[0].dispatchEvent(new CustomEvent("page" + name, {
bubbles: true,
detail: {
data: data
}
}));
// use the widget trigger method for the new content* event // use the widget trigger method for the new content* event
this._trigger(name, newEvent, data); //this._trigger(name, newEvent, data);
return { return {
deprecatedEvent: deprecatedEvent, deprecatedEvent: deprecatedEvent,
@ -3589,8 +3602,8 @@
$.mobile._registerInternalEvents = function () { $.mobile._registerInternalEvents = function () {
// click routing - direct to HTTP or Ajax, accordingly // click routing - direct to HTTP or Ajax, accordingly
$.mobile.document.bind("click", function (event) { document.addEventListener("click", function (event) {
if (!$.mobile.linkBindingEnabled || event.isDefaultPrevented()) { if (!$.mobile.linkBindingEnabled) {
return; return;
} }
@ -3703,8 +3716,9 @@
} }
//set page min-heights to be device specific //set page min-heights to be device specific
$.mobile.document.bind("pagehide", function (e, data) { document.addEventListener("pagehide", function (e) {
var data = e.detail.data;
var toPage = data.toPage ? data.toPage[0] : null; var toPage = data.toPage ? data.toPage[0] : null;
if (toPage) { if (toPage) {