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

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/appsettings.js
View file

@ -84,14 +84,6 @@
return appStorage.getItem('syncOnlyOnWifi') != 'false';
},
syncLosslessAudio: function (val) {
if (val != null) {
update('syncLosslessAudio', val.toString());
}
return appStorage.getItem('syncLosslessAudio') != 'false';
},
syncPath: function (val) {
if (val != null) {

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

@ -1159,7 +1159,7 @@
performAdvancedRefresh(page);
break;
case 'delete':
LibraryBrowser.deleteItem(currentItem.Id);
LibraryBrowser.deleteItems([currentItem.Id]);
break;
case 'editimages':
LibraryBrowser.editImages(currentItem.Id);

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

@ -1915,7 +1915,7 @@
if (currentItem && currentItem.Id == itemId) {
if (currentItem.Type == 'Recording') {
Dashboard.navigate('livetv.html');
LibraryBrowser.showTab('livetv.html', 3);
} else {
Dashboard.navigate('index.html');
}

50
dashboard-ui/scripts/librarybrowser.js
View file

@ -155,7 +155,7 @@
enableFullPaperTabs: function () {
if (browserInfo.animate && !browserInfo.mobile) {
//return true;
return true;
}
return AppInfo.isNativeApp;
@ -834,27 +834,37 @@
});
Dashboard.alert(Globalize.translate('MessageRefreshQueued'));
},
deleteItem: function (itemId) {
deleteItems: function (itemIds) {
// The timeout allows the flyout to close
setTimeout(function () {
return new Promise(function (resolve, reject) {
var msg = Globalize.translate('ConfirmDeleteItem');
var title = Globalize.translate('HeaderDeleteItem');
Dashboard.confirm(msg, Globalize.translate('HeaderDeleteItem'), function (result) {
if (itemIds.length > 1) {
msg = Globalize.translate('ConfirmDeleteItems');
title = Globalize.translate('HeaderDeleteItems');
}
Dashboard.confirm(msg, title, function (result) {
if (result) {
ApiClient.deleteItem(itemId);
Events.trigger(LibraryBrowser, 'itemdeleting', [itemId]);
var promises = itemIds.map(function (itemId) {
ApiClient.deleteItem(itemId);
Events.trigger(LibraryBrowser, 'itemdeleting', [itemId]);
});
resolve();
} else {
reject();
}
});
}, 250);
});
},
editImages: function (itemId) {
@ -876,11 +886,11 @@
editMetadata: function (itemId) {
Dashboard.navigate('edititemmetadata.html?id=' + itemId);
return;
require(['components/metadataeditor/metadataeditor'], function () {
MetadataEditor.show(itemId);
});
//require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
// metadataeditor.show(itemId);
//});
},
showMoreCommands: function (positionTo, itemId, commands) {
@ -991,7 +1001,7 @@
PlaylistManager.showPanel([itemId]);
break;
case 'delete':
LibraryBrowser.deleteItem(itemId);
LibraryBrowser.deleteItems([itemId]);
break;
case 'download':
{
@ -1594,12 +1604,8 @@
itemCommands.push('queuefromhere');
}
// There's no detail page with a dedicated delete function
if (item.Type == 'Playlist' || item.Type == 'BoxSet') {
if (item.CanDelete) {
itemCommands.push('delete');
}
if (item.CanDelete) {
itemCommands.push('delete');
}
if (SyncManager.isAvailable(item)) {
@ -2892,7 +2898,7 @@
var fireCallbackOnClose = false;
var delay = browserInfo.animate ? 0 : 100;
setTimeout(function() {
setTimeout(function () {
paperDialogHelper.open(dlg).then(function () {
if (options.callback && fireCallbackOnClose) {

18
dashboard-ui/scripts/librarylist.js
View file

@ -469,7 +469,7 @@
PlaylistManager.showPanel([itemId]);
break;
case 'delete':
LibraryBrowser.deleteItem(itemId);
LibraryBrowser.deleteItems([itemId]);
break;
case 'download':
{
@ -1025,7 +1025,7 @@
function showSelections(initialCard) {
require(['paper-checkbox'], function() {
require(['paper-checkbox'], function () {
var cards = document.querySelectorAll('.card');
for (var i = 0, length = cards.length; i < length; i++) {
showSelection(cards[i]);
@ -1101,6 +1101,14 @@
ironIcon: 'playlist-add'
});
if (user.Policy.EnableContentDeletion) {
items.push({
name: Globalize.translate('ButtonDelete'),
id: 'delete',
ironIcon: 'delete'
});
}
if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
//items.push({
// name: Globalize.translate('ButtonDownload'),
@ -1149,6 +1157,12 @@
PlaylistManager.showPanel(items);
hideSelections();
break;
case 'delete':
LibraryBrowser.deleteItems(items).then(function () {
Dashboard.navigate('index.html');
});
hideSelections();
break;
case 'groupvideos':
combineVersions($($.mobile.activePage)[0], items);
break;

9
dashboard-ui/scripts/livetvrecordings.js
View file

@ -70,7 +70,8 @@
showParentTitle: true,
centerText: true,
coverImage: true,
lazy: true
lazy: true,
overlayPlayButton: true
});
@ -84,7 +85,8 @@
ApiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
IsInProgress: true
IsInProgress: true,
Fields: 'CanDelete'
}).then(function (result) {
@ -96,7 +98,8 @@
userId: Dashboard.getCurrentUserId(),
limit: 12,
IsInProgress: false
IsInProgress: false,
Fields: 'CanDelete'
}).then(function (result) {

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

@ -569,7 +569,7 @@
// viblast can help us here
//return true;
return window.MediaSource != null;
return window.MediaSource != null && !browserInfo.firefox;
};
self.changeStream = function (ticks, params) {

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

@ -4,7 +4,6 @@
page.querySelector('#txtSyncPath').value = AppSettings.syncPath();
page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi();
page.querySelector('#chkSyncLosslessAudio').checked = AppSettings.syncLosslessAudio();
var uploadServers = AppSettings.cameraUploadServers();
@ -24,7 +23,6 @@
AppSettings.syncPath(page.querySelector('#txtSyncPath').value);
AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked);
AppSettings.syncLosslessAudio(page.querySelector('#chkSyncLosslessAudio').checked);
AppSettings.cameraUploadServers($(".chkUploadServer", page).get().filter(function (i) {

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

@ -235,7 +235,7 @@
$('#regPrice', page).html("<h3>" + Globalize.translate('ValuePriceUSD').replace('{0}', "$" + pkg.price.toFixed(2)) + "</h3>");
$('#ppButton', page).hide();
var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
var url = "https://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url).then(function (response) {

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

@ -617,7 +617,7 @@
html += '<div>';
html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + Globalize.translate('HeaderLatestTvRecordings') + '</h1>';
html += '<a href="livetv.html?tab=3" onclick="LibraryManager.showTab(\'livetv.html\',3);" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
html += '<a href="livetv.html?tab=3" onclick="LibraryBrowser.showTab(\'livetv.html\',3);" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
html += '</div>';
}

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

@ -1849,6 +1849,14 @@ var AppInfo = {};
connectservice: apiClientBowerPath + '/connectservice'
};
if (navigator.webkitPersistentStorage) {
paths.imageloader = embyWebComponentsBowerPath + "/images/persistentimageloader";
} else if (Dashboard.isRunningInCordova()) {
paths.imageloader = 'cordova/imagestore';
} else {
paths.imageloader = embyWebComponentsBowerPath + "/images/basicimageloader";
}
paths.hlsjs = bowerPath + "/hls.js/dist/hls.min";
if (Dashboard.isRunningInCordova()) {
@ -1878,6 +1886,7 @@ var AppInfo = {};
};
requirejs.config({
waitSeconds: 0,
map: {
'*': {
'css': bowerPath + '/emby-webcomponents/requirecss',
@ -1999,7 +2008,7 @@ var AppInfo = {};
}
if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("audiorenderer", ["cordova/android/vlcplayer"]);
define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["cordova/android/vlcplayer"]);
}
else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
@ -2124,23 +2133,11 @@ var AppInfo = {};
};
if (Dashboard.isRunningInCordova() && browserInfo.android) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
// TODO: This is going to exclude it from both playback and sync, so improve on this
if (AppSettings.syncLosslessAudio()) {
AppInfo.directPlayAudioContainers.push('flac');
}
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
}
else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
// TODO: This is going to exclude it from both playback and sync, so improve on this
if (AppSettings.syncLosslessAudio()) {
AppInfo.directPlayAudioContainers.push('flac');
}
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac".split(',');
}
var promises = [];
@ -2262,13 +2259,6 @@ var AppInfo = {};
var postInitDependencies = [];
if (navigator.webkitPersistentStorage) {
postInitDependencies.push('components/imagestore');
}
else if (Dashboard.isRunningInCordova()) {
postInitDependencies.push('cordova/imagestore');
}
postInitDependencies.push('scripts/thememediaplayer');
postInitDependencies.push('scripts/remotecontrol');
postInitDependencies.push('css!css/notifications.css');
@ -2357,7 +2347,7 @@ var AppInfo = {};
deviceName = "Chrome";
} else if (browserInfo.edge) {
deviceName = "Edge";
} else if (browserInfo.mozilla) {
} else if (browserInfo.firefox) {
deviceName = "Firefox";
} else if (browserInfo.msie) {
deviceName = "Internet Explorer";
@ -2396,7 +2386,7 @@ var AppInfo = {};
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
keys.push(new Date().getTime());
var randomId = CryptoJS.SHA1(keys.join('|')).toString();
appStorage.setItem('_deviceId', randomId);
onDeviceAdAcquired(randomId);

4
dashboard-ui/scripts/supporterkeypage.js
View file

@ -77,7 +77,7 @@
oldkey: oldkey
};
var url = "http://mb3admin.com/admin/service/supporter/linkKeys";
var url = "https://mb3admin.com/admin/service/supporter/linkKeys";
console.log(url);
$.post(url, info).then(function (res) {
var result = JSON.parse(res);
@ -101,7 +101,7 @@
var email = $('#txtEmail', form).val();
var url = "http://mb3admin.com/admin/service/supporter/retrievekey?email=" + email;
var url = "https://mb3admin.com/admin/service/supporter/retrievekey?email=" + email;
console.log(url);
$.post(url).then(function (res) {
var result = JSON.parse(res);