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

update sync dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2016-12-26 12:37:05 -05:00
parent db403c3cd4
commit f5ad0dbc21
12 changed files with 124 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dashboard-ui/bower_components/emby-webcomponents/sync/syncjobeditor.js vendored
View file

@ -62,10 +62,10 @@
} else {
html += '<div class="secondary">';
}
html += globalize.translate('SyncJobItemStatus' + jobItem.Status);
html += globalize.translate('sharedcomponents#SyncJobItemStatus' + jobItem.Status);
if (jobItem.Status == 'Synced' && jobItem.IsMarkedForRemoval) {
html += '<br/>';
html += globalize.translate('SyncJobItemStatusSyncedMarkForRemoval');
html += globalize.translate('sharedcomponents#RemovingFromDevice');
}
html += '</div>';
@ -92,7 +92,7 @@
var html = '';
html += '<h1>' + globalize.translate('HeaderItems') + '</h1>';
html += '<h1>' + globalize.translate('sharedcomponents#Items') + '</h1>';
html += '<div class="paperList">';
@ -133,33 +133,27 @@
var menuItems = [];
if (status == 'Failed') {
if (status == 'Failed' || status == 'Cancelled') {
menuItems.push({
name: globalize.translate('ButtonQueueForRetry'),
id: 'retry'
});
}
else if (status == 'Cancelled') {
menuItems.push({
name: globalize.translate('ButtonReenable'),
name: globalize.translate('sharedcomponents#Retry'),
id: 'retry'
});
}
else if (status == 'Queued' || status == 'Transferring' || status == 'Converting' || status == 'ReadyToTransfer') {
menuItems.push({
name: globalize.translate('ButtonCancelItem'),
name: globalize.translate('sharedcomponents#CancelDownload'),
id: 'cancel'
});
}
else if (status == 'Synced' && remove) {
menuItems.push({
name: globalize.translate('ButtonUnmarkForRemoval'),
name: globalize.translate('sharedcomponents#KeepOnDevice'),
id: 'unmarkforremoval'
});
}
else if (status == 'Synced') {
menuItems.push({
name: globalize.translate('ButtonMarkForRemoval'),
name: globalize.translate('sharedcomponents#RemoveFromDevice'),
id: 'markforremoval'
});
}

85
dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js vendored
View file

@ -1,4 +1,4 @@
define(['serverNotifications', 'events', 'loading', 'connectionManager', 'imageLoader', 'dom', 'globalize', 'listViewStyle'], function (serverNotifications, events, loading, connectionManager, imageLoader, dom, globalize) {
define(['serverNotifications', 'events', 'loading', 'connectionManager', 'imageLoader', 'dom', 'globalize', 'registrationServices', 'listViewStyle'], function (serverNotifications, events, loading, connectionManager, imageLoader, dom, globalize, registrationServices) {
'use strict';
function onSyncJobsUpdated(e, apiClient, data) {
@ -20,10 +20,15 @@
require(['confirm'], function (confirm) {
var msg = listInstance.options.isLocalSync ?
globalize.translate('ConfirmRemoveDownload') :
globalize.translate('CancelSyncJobConfirmation');
globalize.translate('sharedcomponents#ConfirmRemoveDownload') :
globalize.translate('sharedcomponents#CancelSyncJobConfirmation');
confirm(msg).then(function () {
confirm({
text: msg,
primary: 'cancel'
}).then(function () {
loading.show();
var apiClient = getApiClient(listInstance);
@ -94,10 +99,10 @@ globalize.translate('CancelSyncJobConfirmation');
textLines.push(job.Name);
if (job.ItemCount == 1) {
textLines.push(globalize.translate('ValueItemCount', job.ItemCount));
if (job.ItemCount === 1) {
textLines.push(globalize.translate('sharedcomponents#ValueOneItem'));
} else {
textLines.push(globalize.translate('ValueItemCountPlural', job.ItemCount));
textLines.push(globalize.translate('sharedcomponents#ItemCount', job.ItemCount));
}
if (textLines >= 3) {
@ -165,10 +170,10 @@ globalize.translate('CancelSyncJobConfirmation');
html += '<div class="detailSectionHeader">';
html += '<div>' + targetName + '</div>';
html += '<h1>' + targetName + '</h1>';
html += '</div>';
html += '<div class="itemsContainer vertical-list">';
html += '<div class="itemsContainer vertical-list paperList">';
hasOpenSection = true;
}
}
@ -180,13 +185,13 @@ globalize.translate('CancelSyncJobConfirmation');
html += '</div>';
}
var elem = listInstance.options.element;
var elem = listInstance.options.element.querySelector('.syncJobListContent');
if (!html) {
if (isLocalSync) {
html = '<div style="padding:1em .25em;">' + globalize.translate('MessageDownloadsFound') + '</div>';
html = '<div style="padding:1em .25em;">' + globalize.translate('sharedcomponents#MessageNoDownloadsFound') + '</div>';
} else {
html = '<div style="padding:1em .25em;">' + globalize.translate('MessageNoSyncJobsFound') + '</div>';
html = '<div style="padding:1em .25em;">' + globalize.translate('sharedcomponents#MessageNoSyncJobsFound') + '</div>';
}
}
@ -260,16 +265,16 @@ globalize.translate('CancelSyncJobConfirmation');
if (status == 'Cancelled') {
menuItems.push({
name: globalize.translate('ButtonDelete'),
name: globalize.translate('sharedcomponents#Delete'),
id: 'delete'
});
} else {
var txt = listInstance.options.isLocalSync ?
globalize.translate('RemoveDownload') :
globalize.translate('ButtonCancelSyncJob');
globalize.translate('sharedcomponents#RemoveDownload') :
globalize.translate('sharedcomponents#ButtonCancelSyncJob');
menuItems.push({
name: globalize.translate(txt),
name: txt,
id: 'cancel'
});
}
@ -312,7 +317,14 @@ globalize.translate('ButtonCancelSyncJob');
if (listItem) {
var jobId = listItem.getAttribute('data-id');
// edit job
events.trigger(listInstance, 'jobedit', [jobId, listInstance.options.serverId]);
require(['syncJobEditor'], function (syncJobEditor) {
syncJobEditor.show({
serverId: listInstance.options.serverId,
jobId: jobId
}).then(function () {
fetchData(listInstance);
});
});
}
}
@ -327,8 +339,47 @@ globalize.translate('ButtonCancelSyncJob');
options.element.addEventListener('click', onClickHandler);
this.onClickHandler = onClickHandler;
options.element.innerHTML = '<div class="syncJobListContent"></div>';
fetchData(this);
startListening(this);
initSupporterInfo(options.element, getApiClient(this));
}
function showSupporterInfo(context) {
var html = '<button is="emby-button" class="raised button-accent block btnSyncSupporter" style="margin:1em 0;">';
html += '<div>';
html += globalize.translate('sharedcomponents#HeaderSyncRequiresSub');
html += '</div>';
html += '<div style="margin-top:.5em;">';
html += globalize.translate('sharedcomponents#LearnMore');
html += '</div>';
html += '</button';
context.insertAdjacentHTML('afterbegin', html);
context.querySelector('.btnSyncSupporter').addEventListener('click', function () {
registrationServices.validateFeature('sync');
});
}
function initSupporterInfo(context, apiClient) {
apiClient.getPluginSecurityInfo().then(function (regInfo) {
if (!regInfo.IsMBSupporter) {
showSupporterInfo(context, apiClient);
}
}, function () {
showSupporterInfo(context, apiClient);
});
}
syncJobList.prototype.destroy = function () {

9
dashboard-ui/bower_components/emby-webcomponents/sync/synctoggle.js vendored
View file

@ -10,6 +10,7 @@
var self = this;
options = options || {};
self.options = options;
function resetSyncStatus() {
@ -67,12 +68,10 @@
}
}
syncToggle.prototype.refresh = function(item) {
syncToggle.prototype.refresh = function (item) {
if (this.options) {
this.options.item = item;
updateSyncStatus(this.options.container, item);
}
this.options.item = item;
updateSyncStatus(this.options.container, item);
};
syncToggle.prototype.destroy = function () {