mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update components
This commit is contained in:
parent
d3a9a9b49e
commit
bcfbb01b4b
45 changed files with 405 additions and 390 deletions
|
@ -91,7 +91,7 @@
|
|||
html += "</div>";
|
||||
}
|
||||
|
||||
Events.trigger($('#latestReviews', page).html(html)[0], 'create');
|
||||
$('#latestReviews', page).html(html).trigger('create');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
picker.innerHTML = getPickerHtml();
|
||||
|
||||
Events.on(picker, 'click', 'a', function () {
|
||||
$(picker).on('click', 'a', function () {
|
||||
|
||||
var elem = this;
|
||||
|
||||
|
@ -52,9 +52,9 @@
|
|||
if (!isSelected) {
|
||||
|
||||
elem.classList.add('selectedCharacter');
|
||||
Events.trigger(picker, 'alphaselect', [this.innerHTML]);
|
||||
$(picker).trigger('alphaselect', [this.innerHTML]);
|
||||
} else {
|
||||
Events.trigger(picker, 'alphaclear');
|
||||
$(picker).trigger('alphaclear');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -843,7 +843,7 @@
|
|||
|
||||
MediaController.registerPlayer(new chromecastPlayer());
|
||||
|
||||
$(MediaController).on('playerchange', function (e, newPlayer, newTarget) {
|
||||
Events.on(MediaController, 'playerchange', function (e, newPlayer, newTarget) {
|
||||
if (newPlayer.name == PlayerName) {
|
||||
if (castPlayer.deviceState != DEVICE_STATE.ACTIVE && castPlayer.isInitialized) {
|
||||
castPlayer.launchApp();
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
DashboardPage.pollForInfo(page);
|
||||
DashboardPage.startInterval(apiClient);
|
||||
|
||||
$(apiClient).on("websocketmessage", DashboardPage.onWebSocketMessage)
|
||||
.on("websocketopen", DashboardPage.onWebSocketOpen);
|
||||
Events.on(apiClient, 'websocketmessage', DashboardPage.onWebSocketMessage);
|
||||
Events.on(apiClient, 'websocketopen', DashboardPage.onWebSocketOpen);
|
||||
|
||||
DashboardPage.lastAppUpdateCheck = null;
|
||||
DashboardPage.lastPluginUpdateCheck = null;
|
||||
|
@ -53,7 +53,8 @@
|
|||
var apiClient = ApiClient;
|
||||
|
||||
if (apiClient) {
|
||||
$(apiClient).off("websocketmessage", DashboardPage.onWebSocketMessage).off("websocketopen", DashboardPage.onWebSocketConnectionChange).off("websocketerror", DashboardPage.onWebSocketConnectionChange).off("websocketclose", DashboardPage.onWebSocketConnectionChange);
|
||||
Events.off(apiClient, 'websocketmessage', DashboardPage.onWebSocketMessage);
|
||||
Events.off(apiClient, 'websocketopen', DashboardPage.onWebSocketOpen);
|
||||
DashboardPage.stopInterval(apiClient);
|
||||
}
|
||||
|
||||
|
@ -1195,7 +1196,8 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
|
|||
return;
|
||||
}
|
||||
|
||||
$(apiClient).on('websocketmessage', onSocketMessage).on('websocketopen', onSocketOpen);
|
||||
Events.on(apiClient, 'websocketopen', onSocketOpen);
|
||||
Events.on(apiClient, 'websocketmessage', onSocketMessage);
|
||||
}
|
||||
|
||||
function startListening(apiClient) {
|
||||
|
@ -1239,7 +1241,8 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
|
|||
var apiClient = ApiClient;
|
||||
|
||||
if (apiClient) {
|
||||
$(apiClient).off('websocketopen', onSocketOpen).off('websocketmessage', onSocketOpen);
|
||||
Events.off(apiClient, 'websocketopen', onSocketOpen);
|
||||
Events.off(apiClient, 'websocketmessage', onSocketMessage);
|
||||
|
||||
stopListening(apiClient);
|
||||
}
|
||||
|
|
|
@ -1098,12 +1098,12 @@
|
|||
|
||||
function bindItemChanged(page) {
|
||||
|
||||
$(ApiClient).on("websocketmessage", onWebSocketMessageReceived);
|
||||
Events.on(ApiClient, "websocketmessage", onWebSocketMessageReceived);
|
||||
}
|
||||
|
||||
function unbindItemChanged(page) {
|
||||
|
||||
$(ApiClient).off("websocketmessage", onWebSocketMessageReceived);
|
||||
Events.off(ApiClient, "websocketmessage", onWebSocketMessageReceived);
|
||||
}
|
||||
|
||||
function onItemDeleted(e, itemId) {
|
||||
|
@ -1221,13 +1221,13 @@
|
|||
|
||||
var page = this;
|
||||
|
||||
$(LibraryBrowser).on('itemdeleting', onItemDeleted);
|
||||
Events.on(LibraryBrowser, 'itemdeleting', onItemDeleted);
|
||||
reload(page);
|
||||
|
||||
}).on('pagebeforehide', "#editItemMetadataPage", function () {
|
||||
|
||||
var page = this;
|
||||
$(LibraryBrowser).off('itemdeleting', onItemDeleted);
|
||||
Events.off(LibraryBrowser, 'itemdeleting', onItemDeleted);
|
||||
|
||||
unbindItemChanged(page);
|
||||
});
|
||||
|
|
|
@ -71,7 +71,6 @@
|
|||
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
|
||||
|
||||
updateFilterControls(page, viewPanel);
|
||||
var trigger = false;
|
||||
|
||||
if (view == "List") {
|
||||
|
||||
|
@ -79,7 +78,6 @@
|
|||
items: result.Items,
|
||||
sortBy: query.SortBy
|
||||
});
|
||||
trigger = true;
|
||||
}
|
||||
else if (view == "Poster") {
|
||||
html += LibraryBrowser.getPosterViewHtml({
|
||||
|
@ -108,10 +106,6 @@
|
|||
elem.innerHTML = html + pagingHtml;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
|
||||
if (trigger) {
|
||||
Events.trigger(elem, 'create');
|
||||
}
|
||||
|
||||
$('.btnNextPage', page).on('click', function () {
|
||||
query.StartIndex += query.Limit;
|
||||
reloadItems(page, viewPanel);
|
||||
|
|
|
@ -448,28 +448,28 @@
|
|||
|
||||
if (elem.tagName == 'AUDIO') {
|
||||
|
||||
Events.off(elem, 'timeupdate', onTimeUpdate);
|
||||
Events.off(elem, 'ended', onEnded);
|
||||
Events.off(elem, 'volumechange', onVolumeChange);
|
||||
Events.off(elem, 'playing', onOneAudioPlaying);
|
||||
Events.off(elem, 'play', onPlay);
|
||||
Events.off(elem, 'pause', onPause);
|
||||
Events.off(elem, 'playing', onPlaying);
|
||||
Events.off(elem, 'error', onError);
|
||||
elem.removeEventListener('timeupdate', onTimeUpdate);
|
||||
elem.removeEventListener('ended', onEnded);
|
||||
elem.removeEventListener('volumechange', onVolumeChange);
|
||||
elem.removeEventListener('playing', onOneAudioPlaying);
|
||||
elem.removeEventListener('play', onPlay);
|
||||
elem.removeEventListener('pause', onPause);
|
||||
elem.removeEventListener('playing', onPlaying);
|
||||
elem.removeEventListener('error', onError);
|
||||
|
||||
} else {
|
||||
|
||||
Events.off(elem, 'loadedmetadata', onLoadedMetadata);
|
||||
Events.off(elem, 'playing', onOneVideoPlaying);
|
||||
Events.off(elem, 'timeupdate', onTimeUpdate);
|
||||
Events.off(elem, 'ended', onEnded);
|
||||
Events.off(elem, 'volumechange', onVolumeChange);
|
||||
Events.off(elem, 'play', onPlay);
|
||||
Events.off(elem, 'pause', onPause);
|
||||
Events.off(elem, 'playing', onPlaying);
|
||||
Events.off(elem, 'click', onClick);
|
||||
Events.off(elem, 'dblclick', onDblClick);
|
||||
Events.off(elem, 'error', onError);
|
||||
elem.removeEventListener('loadedmetadata', onLoadedMetadata);
|
||||
elem.removeEventListener('playing', onOneVideoPlaying);
|
||||
elem.removeEventListener('timeupdate', onTimeUpdate);
|
||||
elem.removeEventListener('ended', onEnded);
|
||||
elem.removeEventListener('volumechange', onVolumeChange);
|
||||
elem.removeEventListener('play', onPlay);
|
||||
elem.removeEventListener('pause', onPause);
|
||||
elem.removeEventListener('playing', onPlaying);
|
||||
elem.removeEventListener('click', onClick);
|
||||
elem.removeEventListener('dblclick', onDblClick);
|
||||
elem.removeEventListener('error', onError);
|
||||
}
|
||||
|
||||
if (elem.tagName.toLowerCase() != 'audio') {
|
||||
|
|
|
@ -286,13 +286,13 @@
|
|||
pageIdOn('pageshow', "indexPage", function () {
|
||||
|
||||
var page = this;
|
||||
$(MediaController).on('playbackstop', onPlaybackStop);
|
||||
Events.on(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
pageIdOn('pagebeforehide', "indexPage", function () {
|
||||
|
||||
var page = this;
|
||||
$(MediaController).off('playbackstop', onPlaybackStop);
|
||||
Events.off(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
function onPlaybackStop(e, state) {
|
||||
|
|
|
@ -1375,7 +1375,8 @@
|
|||
}
|
||||
|
||||
function initializeApiClient(apiClient) {
|
||||
$(apiClient).off('websocketmessage', onWebSocketMessage).on('websocketmessage', onWebSocketMessage);
|
||||
Events.off(apiClient, "websocketmessage", onWebSocketMessage);
|
||||
Events.on(apiClient, "websocketmessage", onWebSocketMessage);
|
||||
}
|
||||
|
||||
function clearRefreshTimes() {
|
||||
|
@ -1386,7 +1387,7 @@
|
|||
initializeApiClient(window.ApiClient);
|
||||
}
|
||||
|
||||
$(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
|
||||
Events.on(ConnectionManager, 'apiclientcreated', function (e, apiClient) {
|
||||
initializeApiClient(apiClient);
|
||||
});
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@
|
|||
refreshLibraryInfoInDrawer(user, drawer);
|
||||
refreshBottomUserInfoInDrawer(user, drawer);
|
||||
|
||||
Events.trigger(document, 'libraryMenuCreated');
|
||||
document.dispatchEvent(new CustomEvent("libraryMenuCreated", {}));
|
||||
updateLibraryMenu(user.localUser);
|
||||
}
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
html += '</ul>';
|
||||
|
||||
Events.trigger($('.serverLogs', page).html(html)[0], 'create');
|
||||
$('.serverLogs', page).html(html).trigger('create');
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1026,7 +1026,8 @@
|
|||
}
|
||||
|
||||
function initializeApiClient(apiClient) {
|
||||
$(apiClient).off("websocketmessage", onWebSocketMessageReceived).on("websocketmessage", onWebSocketMessageReceived);
|
||||
Events.off(apiClient, "websocketmessage", onWebSocketMessageReceived);
|
||||
Events.on(apiClient, "websocketmessage", onWebSocketMessageReceived);
|
||||
}
|
||||
|
||||
MediaController.init = function () {
|
||||
|
@ -1034,7 +1035,7 @@
|
|||
initializeApiClient(window.ApiClient);
|
||||
}
|
||||
|
||||
$(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
|
||||
Events.on(ConnectionManager, 'apiclientcreated', function (e, apiClient) {
|
||||
initializeApiClient(apiClient);
|
||||
});
|
||||
};
|
||||
|
|
|
@ -72,7 +72,6 @@
|
|||
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
|
||||
|
||||
updateFilterControls(page);
|
||||
var trigger = false;
|
||||
|
||||
if (view == "Thumb") {
|
||||
html = LibraryBrowser.getPosterViewHtml({
|
||||
|
@ -112,7 +111,6 @@
|
|||
items: result.Items,
|
||||
sortBy: query.SortBy
|
||||
});
|
||||
trigger = true;
|
||||
}
|
||||
else if (view == "Poster") {
|
||||
html = LibraryBrowser.getPosterViewHtml({
|
||||
|
@ -150,10 +148,6 @@
|
|||
elem.innerHTML = html + pagingHtml;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
|
||||
if (trigger) {
|
||||
Events.trigger(elem, 'create');
|
||||
}
|
||||
|
||||
$('.btnNextPage', page).on('click', function () {
|
||||
query.StartIndex += query.Limit;
|
||||
reloadItems(page, viewPanel);
|
||||
|
|
|
@ -370,13 +370,13 @@
|
|||
}
|
||||
}
|
||||
|
||||
$(MediaController).on('playbackstop', onPlaybackStop);
|
||||
Events.on(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
pageIdOn('pagebeforehide', "moviesPage", function () {
|
||||
|
||||
var page = this;
|
||||
$(MediaController).off('playbackstop', onPlaybackStop);
|
||||
Events.off(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
function onPlaybackStop(e, state) {
|
||||
|
|
|
@ -66,7 +66,6 @@
|
|||
items: result.Items,
|
||||
shape: "backdrop",
|
||||
preferThumb: true,
|
||||
context: 'music',
|
||||
showItemCounts: true,
|
||||
lazy: true,
|
||||
centerText: true,
|
||||
|
@ -79,13 +78,21 @@
|
|||
items: result.Items,
|
||||
shape: "backdrop",
|
||||
preferThumb: true,
|
||||
context: 'music',
|
||||
showItemCounts: true,
|
||||
cardLayout: true,
|
||||
lazy: true,
|
||||
showTitle: true
|
||||
});
|
||||
}
|
||||
else if (view == "Poster") {
|
||||
html = LibraryBrowser.getPosterViewHtml({
|
||||
items: result.Items,
|
||||
shape: "portrait",
|
||||
centerText: true,
|
||||
showItemCounts: true,
|
||||
lazy: true
|
||||
});
|
||||
}
|
||||
|
||||
var elem = page.querySelector('#items');
|
||||
elem.innerHTML = html;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
ApiClient.getUser(userId).then(function (user) {
|
||||
|
||||
$('.username', page).html(user.Name);
|
||||
Events.trigger($('#uploadUserImage', page).val('')[0], 'change');
|
||||
$('#uploadUserImage', page).val('').trigger('change');
|
||||
|
||||
Dashboard.setPageTitle(user.Name);
|
||||
|
||||
|
|
|
@ -177,14 +177,15 @@
|
|||
}
|
||||
|
||||
function initializeApiClient(apiClient) {
|
||||
$(apiClient).off("websocketmessage", onWebSocketMessage).on("websocketmessage", onWebSocketMessage);
|
||||
Events.off(apiClient, "websocketmessage", onWebSocketMessage);
|
||||
Events.on(apiClient, "websocketmessage", onWebSocketMessage);
|
||||
}
|
||||
|
||||
if (window.ApiClient) {
|
||||
initializeApiClient(window.ApiClient);
|
||||
}
|
||||
|
||||
$(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
|
||||
Events.on(ConnectionManager, 'apiclientcreated', function (e, apiClient) {
|
||||
initializeApiClient(apiClient);
|
||||
});
|
||||
|
||||
|
|
|
@ -589,11 +589,11 @@
|
|||
|
||||
if (currentPlayer) {
|
||||
|
||||
$(currentPlayer).off('playbackstart', onPlaybackStart)
|
||||
.off('playbackstop', onPlaybackStopped)
|
||||
.off('volumechange', onVolumeChanged)
|
||||
.off('playstatechange', onStateChanged)
|
||||
.off('positionchange', onStateChanged);
|
||||
Events.off(currentPlayer, 'playbackstart', onPlaybackStart);
|
||||
Events.off(currentPlayer, 'playbackstop', onPlaybackStopped);
|
||||
Events.off(currentPlayer, 'volumechange', onStateChanged);
|
||||
Events.off(currentPlayer, 'playstatechange', onVolumeChanged);
|
||||
Events.off(currentPlayer, 'positionchange', onStateChanged);
|
||||
|
||||
currentPlayer.endPlayerUpdates();
|
||||
currentPlayer = null;
|
||||
|
@ -633,11 +633,11 @@
|
|||
onStateChanged.call(player, { type: 'init' }, state);
|
||||
});
|
||||
|
||||
$(player).on('playbackstart', onPlaybackStart)
|
||||
.on('playbackstop', onPlaybackStopped)
|
||||
.on('volumechange', onVolumeChanged)
|
||||
.on('playstatechange', onStateChanged)
|
||||
.on('positionchange', onStateChanged);
|
||||
Events.on(player, 'playbackstart', onPlaybackStart);
|
||||
Events.on(player, 'playbackstop', onPlaybackStopped);
|
||||
Events.on(player, 'volumechange', onStateChanged);
|
||||
Events.on(player, 'playstatechange', onVolumeChanged);
|
||||
Events.on(player, 'positionchange', onStateChanged);
|
||||
}
|
||||
|
||||
Events.on(MediaController, 'playerchange', function () {
|
||||
|
|
|
@ -637,11 +637,11 @@
|
|||
|
||||
if (currentPlayer) {
|
||||
|
||||
$(currentPlayer).off('playbackstart', onPlaybackStart)
|
||||
.off('playbackstop', onPlaybackStopped)
|
||||
.off('volumechange', onStateChanged)
|
||||
.off('playstatechange', onStateChanged)
|
||||
.off('positionchange', onStateChanged);
|
||||
Events.off(currentPlayer, 'playbackstart', onPlaybackStart);
|
||||
Events.off(currentPlayer, 'playbackstop', onPlaybackStopped);
|
||||
Events.off(currentPlayer, 'volumechange', onStateChanged);
|
||||
Events.off(currentPlayer, 'playstatechange', onStateChanged);
|
||||
Events.off(currentPlayer, 'positionchange', onStateChanged);
|
||||
|
||||
currentPlayer.endPlayerUpdates();
|
||||
currentPlayer = null;
|
||||
|
@ -663,11 +663,11 @@
|
|||
onStateChanged.call(player, { type: 'init' }, state);
|
||||
});
|
||||
|
||||
$(player).on('playbackstart', onPlaybackStart)
|
||||
.on('playbackstop', onPlaybackStopped)
|
||||
.on('volumechange', onStateChanged)
|
||||
.on('playstatechange', onStateChanged)
|
||||
.on('positionchange', onStateChanged);
|
||||
Events.on(player, 'playbackstart', onPlaybackStart);
|
||||
Events.on(player, 'playbackstop', onPlaybackStopped);
|
||||
Events.on(player, 'volumechange', onStateChanged);
|
||||
Events.on(player, 'playstatechange', onStateChanged);
|
||||
Events.on(player, 'positionchange', onStateChanged);
|
||||
|
||||
var playerInfo = MediaController.getPlayerInfo();
|
||||
|
||||
|
@ -820,7 +820,7 @@
|
|||
}
|
||||
});
|
||||
|
||||
$(MediaController).on('playerchange', function () {
|
||||
Events.on(MediaController, 'playerchange', function () {
|
||||
updateCastIcon(page);
|
||||
});
|
||||
|
||||
|
@ -832,7 +832,7 @@
|
|||
|
||||
currentImgUrl = null;
|
||||
|
||||
$(MediaController).on('playerchange', onPlayerChange);
|
||||
Events.on(MediaController, 'playerchange', onPlayerChange);
|
||||
|
||||
bindToPlayer(page, MediaController.getCurrentPlayer());
|
||||
|
||||
|
@ -861,7 +861,7 @@
|
|||
|
||||
releaseCurrentPlayer();
|
||||
|
||||
$(MediaController).off('playerchange', onPlayerChange);
|
||||
Events.off(MediaController, 'playerchange', onPlayerChange);
|
||||
|
||||
lastPlayerState = null;
|
||||
$(document.body).removeClass('hiddenViewMenuBar').removeClass('hiddenNowPlayingBar');
|
||||
|
|
|
@ -385,14 +385,15 @@
|
|||
}
|
||||
|
||||
function initializeApiClient(apiClient) {
|
||||
$(apiClient).on("websocketmessage", onWebSocketMessageReceived).on("websocketopen", onWebSocketConnectionChange);
|
||||
Events.on(apiClient, "websocketmessage", onWebSocketMessageReceived);
|
||||
Events.on(apiClient, "websocketopen", onWebSocketConnectionChange);
|
||||
}
|
||||
|
||||
if (window.ApiClient) {
|
||||
initializeApiClient(window.ApiClient);
|
||||
}
|
||||
|
||||
$(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
|
||||
Events.on(ConnectionManager, 'apiclientcreated', function (e, apiClient) {
|
||||
initializeApiClient(apiClient);
|
||||
});
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ var ScheduledTaskPage = {
|
|||
|
||||
var page = $.mobile.activePage;
|
||||
|
||||
Events.trigger($('#selectTriggerType', page).val('DailyTrigger')[0], 'change');
|
||||
$('#selectTriggerType', page).val('DailyTrigger').trigger('change');
|
||||
|
||||
$('#popupAddTrigger', page).on("popupafteropen", function () {
|
||||
$('#addTriggerForm input:first', this).focus();
|
||||
|
|
|
@ -284,13 +284,15 @@
|
|||
reloadList(page);
|
||||
});
|
||||
|
||||
$(ApiClient).on("websocketmessage", onWebSocketMessage).on("websocketopen", onWebSocketConnectionOpen);
|
||||
Events.on(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
Events.on(ApiClient, "websocketopen", onWebSocketConnectionOpen);
|
||||
|
||||
}).on('pagebeforehide', "#scheduledTasksPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
$(ApiClient).off("websocketmessage", onWebSocketMessage).off("websocketopen", onWebSocketConnectionOpen);
|
||||
Events.off(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
Events.off(ApiClient, "websocketopen", onWebSocketConnectionOpen);
|
||||
stopInterval();
|
||||
});
|
||||
|
||||
|
|
|
@ -12,6 +12,13 @@
|
|||
|
||||
})();
|
||||
|
||||
// Compatibility
|
||||
window.Logger = {
|
||||
log: function(msg) {
|
||||
console.log(msg);
|
||||
}
|
||||
};
|
||||
|
||||
var Dashboard = {
|
||||
|
||||
filterHtml: function (html) {
|
||||
|
@ -888,7 +895,6 @@ var Dashboard = {
|
|||
html += '</div>';
|
||||
|
||||
$('.content-primary', page).before(html);
|
||||
Events.trigger(page, 'create');
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -1605,18 +1611,20 @@ var AppInfo = {};
|
|||
apiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality;
|
||||
apiClient.normalizeImageOptions = Dashboard.normalizeImageOptions;
|
||||
|
||||
$(apiClient).off("websocketmessage", Dashboard.onWebSocketMessageReceived).off('requestfail', Dashboard.onRequestFail);
|
||||
Events.off(apiClient, 'websocketmessage', Dashboard.onWebSocketMessageReceived);
|
||||
Events.on(apiClient, 'websocketmessage', Dashboard.onWebSocketMessageReceived);
|
||||
|
||||
$(apiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived).on('requestfail', Dashboard.onRequestFail);
|
||||
Events.off(apiClient, 'requestfail', Dashboard.onRequestFail);
|
||||
Events.on(apiClient, 'requestfail', Dashboard.onRequestFail);
|
||||
}
|
||||
|
||||
//localStorage.clear();
|
||||
function createConnectionManager(capabilities) {
|
||||
function createConnectionManager(credentialProviderFactory, capabilities) {
|
||||
|
||||
var credentialKey = Dashboard.isConnectMode() ? null : 'servercredentials4';
|
||||
var credentialProvider = new MediaBrowser.CredentialProvider(credentialKey);
|
||||
var credentialProvider = new credentialProviderFactory(credentialKey);
|
||||
|
||||
window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities);
|
||||
window.ConnectionManager = new MediaBrowser.ConnectionManager(credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities, window.devicePixelRatio);
|
||||
|
||||
if (window.location.href.toLowerCase().indexOf('wizardstart.html') != -1) {
|
||||
window.ConnectionManager.clearData();
|
||||
|
@ -1653,12 +1661,14 @@ var AppInfo = {};
|
|||
|
||||
} else {
|
||||
|
||||
var apiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId);
|
||||
apiClient.enableAutomaticNetworking = false;
|
||||
ConnectionManager.addApiClient(apiClient);
|
||||
Dashboard.importCss(apiClient.getUrl('Branding/Css'));
|
||||
window.ApiClient = apiClient;
|
||||
resolve();
|
||||
require(['apiclient'], function(apiClientFactory) {
|
||||
var apiClient = new apiClientFactory(Dashboard.serverAddress(), AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, window.devicePixelRatio);
|
||||
apiClient.enableAutomaticNetworking = false;
|
||||
ConnectionManager.addApiClient(apiClient);
|
||||
Dashboard.importCss(apiClient.getUrl('Branding/Css'));
|
||||
window.ApiClient = apiClient;
|
||||
resolve();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -1779,7 +1789,12 @@ var AppInfo = {};
|
|||
masonry: bowerPath + '/masonry/dist/masonry.pkgd.min',
|
||||
humanedate: 'components/humanedate',
|
||||
jQuery: bowerPath + '/jquery/dist/jquery.min',
|
||||
fastclick: bowerPath + '/fastclick/lib/fastclick'
|
||||
fastclick: bowerPath + '/fastclick/lib/fastclick',
|
||||
events: apiClientBowerPath + '/events',
|
||||
credentialprovider: apiClientBowerPath + '/credentials',
|
||||
apiclient: apiClientBowerPath + '/apiclient',
|
||||
connectionmanagerfactory: apiClientBowerPath + '/connectionmanager',
|
||||
connectservice: apiClientBowerPath + '/connectservice'
|
||||
};
|
||||
|
||||
paths.hlsjs = bowerPath + "/hls.js/dist/hls.min";
|
||||
|
@ -1906,13 +1921,8 @@ var AppInfo = {};
|
|||
define("fileupload", [apiClientBowerPath + "/fileupload"]);
|
||||
}
|
||||
|
||||
define("connectservice", [apiClientBowerPath + "/connectservice"]);
|
||||
define("apiclient-store", [apiClientBowerPath + "/store"]);
|
||||
define("apiclient-events", [apiClientBowerPath + "/events"]);
|
||||
define("apiclient-logger", [apiClientBowerPath + "/logger"]);
|
||||
define("apiclient-credentials", [apiClientBowerPath + "/credentials"]);
|
||||
define("apiclient-deferred", [apiClientBowerPath + "/deferred"]);
|
||||
define("apiclient", [apiClientBowerPath + "/apiclient"]);
|
||||
define("apiclient-deferred", ["legacy/deferred"]);
|
||||
define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]);
|
||||
|
||||
define("contentuploader", [apiClientBowerPath + "/sync/contentuploader"]);
|
||||
|
@ -1983,6 +1993,7 @@ var AppInfo = {};
|
|||
define("buttonenabled", ["legacy/buttonenabled"]);
|
||||
|
||||
var deps = [];
|
||||
deps.push('events');
|
||||
|
||||
if (!window.fetch) {
|
||||
deps.push('fetch');
|
||||
|
@ -1990,13 +2001,14 @@ var AppInfo = {};
|
|||
|
||||
deps.push('scripts/mediacontroller');
|
||||
deps.push('scripts/globalize');
|
||||
deps.push('apiclient-events');
|
||||
|
||||
deps.push('jQuery');
|
||||
|
||||
deps.push('paper-drawer-panel');
|
||||
|
||||
require(deps, function () {
|
||||
require(deps, function (events) {
|
||||
|
||||
window.Events = events;
|
||||
|
||||
for (var i in hostingAppInfo) {
|
||||
AppInfo[i] = hostingAppInfo[i];
|
||||
|
@ -2032,6 +2044,8 @@ var AppInfo = {};
|
|||
}
|
||||
|
||||
var deps = [];
|
||||
deps.push('connectionmanagerfactory');
|
||||
deps.push('credentialprovider');
|
||||
|
||||
if (AppInfo.isNativeApp && browserInfo.android) {
|
||||
require(['cordova/android/logging']);
|
||||
|
@ -2040,11 +2054,13 @@ var AppInfo = {};
|
|||
deps.push('appstorage');
|
||||
deps.push('scripts/mediaplayer');
|
||||
deps.push('scripts/appsettings');
|
||||
deps.push('apiclient');
|
||||
deps.push('connectionmanager');
|
||||
deps.push('apiclient-credentials');
|
||||
|
||||
require(deps, function () {
|
||||
require(deps, function (connectionManagerExports, credentialProviderFactory) {
|
||||
|
||||
window.MediaBrowser = window.MediaBrowser || {};
|
||||
for (var i in connectionManagerExports) {
|
||||
MediaBrowser[i] = connectionManagerExports[i];
|
||||
}
|
||||
|
||||
// TODO: This needs to be deprecated, but it's used heavily
|
||||
$.fn.checked = function (value) {
|
||||
|
@ -2094,8 +2110,7 @@ var AppInfo = {};
|
|||
promises.push(getRequirePromise(deps));
|
||||
|
||||
promises.push(Globalize.ensure());
|
||||
promises.push(createConnectionManager(capabilities));
|
||||
|
||||
promises.push(createConnectionManager(credentialProviderFactory, capabilities));
|
||||
|
||||
Promise.all(promises).then(function () {
|
||||
|
||||
|
@ -2417,7 +2432,6 @@ var AppInfo = {};
|
|||
var initialDependencies = [];
|
||||
|
||||
initialDependencies.push('isMobile');
|
||||
initialDependencies.push('apiclient-logger');
|
||||
initialDependencies.push('apiclient-store');
|
||||
initialDependencies.push('scripts/extensions');
|
||||
|
||||
|
|
|
@ -74,8 +74,6 @@
|
|||
elem.innerHTML = html + pagingHtml;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
|
||||
Events.trigger(elem, 'create');
|
||||
|
||||
$('.btnNextPage', page).on('click', function () {
|
||||
query.StartIndex += query.Limit;
|
||||
reloadItems(page, viewPanel);
|
||||
|
|
|
@ -206,7 +206,6 @@
|
|||
}
|
||||
|
||||
var elem = $('.syncActivity', page).html(html).lazyChildren();
|
||||
Events.trigger(elem[0], 'create');
|
||||
|
||||
$('.btnJobMenu', elem).on('click', function () {
|
||||
showJobMenu(page, this);
|
||||
|
@ -417,7 +416,7 @@
|
|||
});
|
||||
|
||||
startListening(page);
|
||||
$(ApiClient).on("websocketmessage", onWebSocketMessage);
|
||||
Events.on(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
|
||||
}).on('pagebeforehide', ".syncActivityPage", function () {
|
||||
|
||||
|
@ -429,7 +428,7 @@
|
|||
});
|
||||
|
||||
stopListening();
|
||||
$(ApiClient).off("websocketmessage", onWebSocketMessage);
|
||||
Events.off(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
});
|
||||
|
||||
})();
|
|
@ -411,14 +411,14 @@
|
|||
loadJob(page);
|
||||
|
||||
startListening(page);
|
||||
$(ApiClient).on("websocketmessage", onWebSocketMessage);
|
||||
Events.on(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
|
||||
}).on('pagebeforehide', ".syncJobPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
stopListening();
|
||||
$(ApiClient).off("websocketmessage", onWebSocketMessage);
|
||||
Events.off(ApiClient, "websocketmessage", onWebSocketMessage);
|
||||
});
|
||||
|
||||
})();
|
|
@ -156,7 +156,8 @@
|
|||
if (options.mode == 'off') {
|
||||
|
||||
this.off('click', onButtonClick);
|
||||
$(ApiClient).off("websocketmessage", onSocketMessage).off('websocketopen', onSocketOpen);
|
||||
Events.off(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.off(ApiClient, 'websocketopen', onSocketOpen);
|
||||
stopInterval();
|
||||
|
||||
} else if (this.length) {
|
||||
|
@ -167,7 +168,8 @@
|
|||
|
||||
startInterval();
|
||||
|
||||
$(ApiClient).on("websocketmessage", onSocketMessage).on('websocketopen', onSocketOpen);
|
||||
Events.on(ApiClient, 'websocketmessage', onSocketMessage);
|
||||
Events.on(ApiClient, 'websocketopen', onSocketOpen);
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
|
@ -298,13 +298,13 @@
|
|||
}
|
||||
}
|
||||
|
||||
$(MediaController).on('playbackstop', onPlaybackStop);
|
||||
Events.on(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
pageIdOn('pagebeforehide', "tvRecommendedPage", function () {
|
||||
|
||||
var page = this;
|
||||
$(MediaController).off('playbackstop', onPlaybackStop);
|
||||
Events.off(MediaController, 'playbackstop', onPlaybackStop);
|
||||
});
|
||||
|
||||
function onPlaybackStop(e, state) {
|
||||
|
|
|
@ -52,7 +52,6 @@
|
|||
var view = getPageData().view;
|
||||
|
||||
var html = '';
|
||||
var trigger = false;
|
||||
var pagingHtml = LibraryBrowser.getQueryPagingHtml({
|
||||
startIndex: query.StartIndex,
|
||||
limit: query.Limit,
|
||||
|
@ -113,7 +112,6 @@
|
|||
context: 'tv',
|
||||
sortBy: query.SortBy
|
||||
});
|
||||
trigger = true;
|
||||
}
|
||||
else if (view == "PosterCard") {
|
||||
html = LibraryBrowser.getPosterViewHtml({
|
||||
|
@ -142,10 +140,6 @@
|
|||
elem.innerHTML = html + pagingHtml;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
|
||||
if (trigger) {
|
||||
Events.trigger(elem, 'create');
|
||||
}
|
||||
|
||||
$('.btnNextPage', page).on('click', function () {
|
||||
query.StartIndex += query.Limit;
|
||||
reloadItems(page, viewPanel);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue