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

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -1,4 +1,4 @@
(function ($, window, document) {
define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-fab'], function (paperDialogHelper) {
var currentItemId;
var currentItemType;
@ -6,7 +6,7 @@
var hasChanges = false;
// These images can be large and we're seeing memory problems in safari
var browsableImagePageSize = $.browser.safari ? 6 : 10;
var browsableImagePageSize = browserInfo.safari ? 6 : 10;
var browsableImageStartIndex = 0;
var browsableImageType = 'Primary';
@ -38,7 +38,7 @@
options.ProviderName = provider;
}
ApiClient.getAvailableRemoteImages(options).done(function (result) {
ApiClient.getAvailableRemoteImages(options).then(function (result) {
renderRemoteImages(page, result, browsableImageType, options.startIndex, options.limit);
@ -65,7 +65,9 @@
html += getRemoteImageHtml(imagesResult.Images[i], imageType);
}
$('.availableImagesList', page).html(html).lazyChildren();
var availableImagesList = page.querySelector('.availableImagesList');
availableImagesList.innerHTML = html;
ImageLoader.lazyChildren(availableImagesList);
$('.btnNextPage', page).on('click', function () {
browsableImageStartIndex += browsableImagePageSize;
@ -125,11 +127,11 @@
Dashboard.showLoadingMsg();
ApiClient.downloadRemoteImage(options).done(function () {
ApiClient.downloadRemoteImage(options).then(function () {
hasChanges = true;
var dlg = $(page).parents('paper-dialog')[0];
PaperDialogHelper.close(dlg);
paperDialogHelper.close(dlg);
});
}
@ -260,17 +262,16 @@
Dashboard.showLoadingMsg();
HttpClient.send({
var xhr = new XMLHttpRequest();
xhr.open('GET', 'components/imagedownloader/imagedownloader.template.html', true);
type: 'GET',
url: 'components/imagedownloader/imagedownloader.template.html'
}).done(function (template) {
xhr.onload = function (e) {
var template = this.response;
currentItemId = itemId;
currentItemType = itemType;
var dlg = PaperDialogHelper.createDialog();
var dlg = paperDialogHelper.createDialog();
var html = '';
html += '<h2 class="dialogHeader">';
@ -288,18 +289,20 @@
// Has to be assigned a z-index after the call to .open()
$(dlg).on('iron-overlay-closed', onDialogClosed);
PaperDialogHelper.openWithHash(dlg, 'imagedownloader');
paperDialogHelper.open(dlg);
var editorContent = dlg.querySelector('.editorContent');
initEditor(editorContent);
$('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
paperDialogHelper.close(dlg);
});
reloadBrowsableImages(editorContent);
});
}
xhr.send();
}
function onDialogClosed() {
@ -309,7 +312,7 @@
currentDeferred.resolveWith(null, [hasChanges]);
}
window.ImageDownloader = {
return {
show: function (itemId, itemType, imageType) {
var deferred = DeferredBuilder.Deferred();
@ -320,12 +323,8 @@
browsableImageType = imageType || 'Primary';
selectedProvider = null;
require(['components/paperdialoghelper'], function () {
showEditor(itemId, itemType);
});
showEditor(itemId, itemType);
return deferred.promise();
}
};
})(jQuery, window, document);
});