mirror of
https://github.com/jellyfin/jellyfin-web.git
synced 2024-11-17 19:08:18 -07:00
update packages
This commit is contained in:
parent
65da95c2ab
commit
253cbaa5b2
@ -132,7 +132,7 @@
|
||||
var key = 'servertestermessagetime';
|
||||
var lastShown = parseInt(appSettings.get(key) || '0');
|
||||
|
||||
if ((new Date().getTime() - lastShown) < 86400000) {
|
||||
if ((new Date().getTime() - lastShown) < 259200000) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -103,6 +103,12 @@
|
||||
ironIcon: 'videocam'
|
||||
});
|
||||
|
||||
menuItems.push({
|
||||
name: Globalize.translate('ButtonEditImages'),
|
||||
id: 'editimages',
|
||||
ironIcon: 'photo'
|
||||
});
|
||||
|
||||
menuItems.push({
|
||||
name: Globalize.translate('ButtonManageFolders'),
|
||||
id: 'edit',
|
||||
@ -136,6 +142,9 @@
|
||||
case 'edit':
|
||||
editVirtualFolder(page, virtualFolder);
|
||||
break;
|
||||
case 'editimages':
|
||||
editImages(page, virtualFolder);
|
||||
break;
|
||||
case 'rename':
|
||||
renameVirtualFolder(page, virtualFolder);
|
||||
break;
|
||||
@ -206,21 +215,26 @@
|
||||
return;
|
||||
}
|
||||
|
||||
require(['components/imageeditor/imageeditor'], function (ImageEditor) {
|
||||
|
||||
ImageEditor.show(virtualFolder.ItemId, {
|
||||
theme: 'a'
|
||||
}).then(function (hasChanged) {
|
||||
if (hasChanged) {
|
||||
reloadLibrary(page);
|
||||
}
|
||||
});
|
||||
});
|
||||
editVirtualFolder(page, virtualFolder);
|
||||
});
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
function editImages(page, virtualFolder) {
|
||||
|
||||
require(['components/imageeditor/imageeditor'], function (ImageEditor) {
|
||||
|
||||
ImageEditor.show(virtualFolder.ItemId, {
|
||||
theme: 'a'
|
||||
}).then(function (hasChanged) {
|
||||
if (hasChanged) {
|
||||
reloadLibrary(page);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function getCollectionTypeOptions() {
|
||||
|
||||
return [
|
||||
|
@ -661,18 +661,28 @@
|
||||
function fadeInUp(elem) {
|
||||
var keyframes = [
|
||||
{ transform: 'translate3d(0, 100%, 0)', offset: 0 },
|
||||
{ transform: 'none', offset: 1 }];
|
||||
{ transform: 'translate3d(0, 0, 0)', offset: 1 }];
|
||||
var timing = { duration: 300, iterations: 1 };
|
||||
elem.animate(keyframes, timing);
|
||||
|
||||
if (elem.animate) {
|
||||
elem.animate(keyframes, timing);
|
||||
}
|
||||
}
|
||||
|
||||
function fadeOutDown(elem) {
|
||||
var keyframes = [{ transform: 'none', offset: 0 },
|
||||
var keyframes = [{ transform: 'translate3d(0, 0, 0)', offset: 0 },
|
||||
{ transform: 'translate3d(0, 100%, 0)', offset: 1 }];
|
||||
var timing = { duration: 300, iterations: 1 };
|
||||
elem.animate(keyframes, timing).onfinish = function () {
|
||||
|
||||
var onFinish = function () {
|
||||
elem.classList.add('hide');
|
||||
};
|
||||
|
||||
if (elem.animate) {
|
||||
elem.animate(keyframes, timing).onfinish = onFinish;
|
||||
} else {
|
||||
onFinish();
|
||||
}
|
||||
}
|
||||
|
||||
function ensureVideoPlayerElements() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
define(['libraryBrowser', 'jQuery', 'scrollStyles'], function (LibraryBrowser, $) {
|
||||
define(['libraryBrowser', 'jQuery', 'appSettings', 'scrollStyles'], function (LibraryBrowser, $, appSettings) {
|
||||
|
||||
function getUserViews(userId) {
|
||||
|
||||
@ -163,9 +163,54 @@
|
||||
html += getLibraryButtonsHtml(items);
|
||||
html += '</div>';
|
||||
|
||||
elem.innerHTML = html;
|
||||
return getAppInfo().then(function (infoHtml) {
|
||||
|
||||
handleLibraryLinkNavigations(elem);
|
||||
elem.innerHTML = html + infoHtml;
|
||||
|
||||
handleLibraryLinkNavigations(elem);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function getAppInfo() {
|
||||
|
||||
if (AppInfo.nativeApp) {
|
||||
return Promise.resolve('');
|
||||
}
|
||||
|
||||
var cacheKey = 'lastappinfopresent5';
|
||||
if ((new Date().getTime() - parseInt(appSettings.get(cacheKey) || '0')) < 172800000) {
|
||||
return Promise.resolve('');
|
||||
}
|
||||
|
||||
function getCard(img) {
|
||||
|
||||
return '<div class="card backdropCard"><div class="cardBox"><div class="cardScalable"><div class="cardPadder"></div><a class="cardContent" href="https://emby.media/download" target="_blank"><div class="cardImage lazy" data-src="' + img + '"></div></a></div></div></div>';
|
||||
}
|
||||
|
||||
return Dashboard.getPluginSecurityInfo().then(function (pluginSecurityInfo) {
|
||||
|
||||
appSettings.set(cacheKey, new Date().getTime());
|
||||
|
||||
if (pluginSecurityInfo.IsMBSupporter) {
|
||||
return '';
|
||||
}
|
||||
|
||||
var html = '';
|
||||
html += '<div>';
|
||||
html += '<h1>Try Emby Theater<paper-icon-button icon="close" onclick="jQuery(this.parentNode.parentNode).remove();" style="margin-left:1em;"></paper-icon-button></h1>';
|
||||
html += '<p>A beautiful app for your TV and large screen tablet. <a href="https://emby.media/download" target="_blank">Emby Theater</a> runs on Windows, Xbox One, Google Chrome, FireFox, Microsoft Edge and Opera.</p>';
|
||||
html += '<div class="itemsContainer">';
|
||||
html += getCard('https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/apps/theater1.png');
|
||||
html += getCard('https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/apps/theater2.png');
|
||||
html += getCard('https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/apps/theater3.png');
|
||||
html += '</div>';
|
||||
html += '<br/>';
|
||||
html += '</div>';
|
||||
|
||||
appSettings.set(cacheKey, new Date().getTime());
|
||||
|
||||
return html;
|
||||
});
|
||||
}
|
||||
|
||||
@ -395,12 +440,15 @@
|
||||
html += '</div>';
|
||||
}
|
||||
|
||||
elem.innerHTML = html;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
return getAppInfo().then(function (infoHtml) {
|
||||
|
||||
LibraryBrowser.createCardMenus(elem, { showDetailsMenu: false });
|
||||
elem.innerHTML = html + infoHtml;
|
||||
ImageLoader.lazyChildren(elem);
|
||||
|
||||
handleLibraryLinkNavigations(elem);
|
||||
LibraryBrowser.createCardMenus(elem, { showDetailsMenu: false });
|
||||
|
||||
handleLibraryLinkNavigations(elem);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CommonIO" version="1.0.0.9" targetFramework="net45" />
|
||||
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
|
||||
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
|
||||
<package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" />
|
||||
</packages>
|
Loading…
Reference in New Issue
Block a user