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

update packages

This commit is contained in:
Luke Pulverenti 2016-04-12 00:03:07 -04:00
parent 65da95c2ab
commit 253cbaa5b2
5 changed files with 94 additions and 23 deletions

View file

@ -132,7 +132,7 @@
var key = 'servertestermessagetime'; var key = 'servertestermessagetime';
var lastShown = parseInt(appSettings.get(key) || '0'); var lastShown = parseInt(appSettings.get(key) || '0');
if ((new Date().getTime() - lastShown) < 86400000) { if ((new Date().getTime() - lastShown) < 259200000) {
return; return;
} }

View file

@ -103,6 +103,12 @@
ironIcon: 'videocam' ironIcon: 'videocam'
}); });
menuItems.push({
name: Globalize.translate('ButtonEditImages'),
id: 'editimages',
ironIcon: 'photo'
});
menuItems.push({ menuItems.push({
name: Globalize.translate('ButtonManageFolders'), name: Globalize.translate('ButtonManageFolders'),
id: 'edit', id: 'edit',
@ -136,6 +142,9 @@
case 'edit': case 'edit':
editVirtualFolder(page, virtualFolder); editVirtualFolder(page, virtualFolder);
break; break;
case 'editimages':
editImages(page, virtualFolder);
break;
case 'rename': case 'rename':
renameVirtualFolder(page, virtualFolder); renameVirtualFolder(page, virtualFolder);
break; break;
@ -206,6 +215,14 @@
return; return;
} }
editVirtualFolder(page, virtualFolder);
});
Dashboard.hideLoadingMsg();
}
function editImages(page, virtualFolder) {
require(['components/imageeditor/imageeditor'], function (ImageEditor) { require(['components/imageeditor/imageeditor'], function (ImageEditor) {
ImageEditor.show(virtualFolder.ItemId, { ImageEditor.show(virtualFolder.ItemId, {
@ -216,9 +233,6 @@
} }
}); });
}); });
});
Dashboard.hideLoadingMsg();
} }
function getCollectionTypeOptions() { function getCollectionTypeOptions() {

View file

@ -661,18 +661,28 @@
function fadeInUp(elem) { function fadeInUp(elem) {
var keyframes = [ var keyframes = [
{ transform: 'translate3d(0, 100%, 0)', offset: 0 }, { transform: 'translate3d(0, 100%, 0)', offset: 0 },
{ transform: 'none', offset: 1 }]; { transform: 'translate3d(0, 0, 0)', offset: 1 }];
var timing = { duration: 300, iterations: 1 }; var timing = { duration: 300, iterations: 1 };
if (elem.animate) {
elem.animate(keyframes, timing); elem.animate(keyframes, timing);
} }
}
function fadeOutDown(elem) { 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 }]; { transform: 'translate3d(0, 100%, 0)', offset: 1 }];
var timing = { duration: 300, iterations: 1 }; var timing = { duration: 300, iterations: 1 };
elem.animate(keyframes, timing).onfinish = function () {
var onFinish = function () {
elem.classList.add('hide'); elem.classList.add('hide');
}; };
if (elem.animate) {
elem.animate(keyframes, timing).onfinish = onFinish;
} else {
onFinish();
}
} }
function ensureVideoPlayerElements() { function ensureVideoPlayerElements() {

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'jQuery', 'scrollStyles'], function (LibraryBrowser, $) { define(['libraryBrowser', 'jQuery', 'appSettings', 'scrollStyles'], function (LibraryBrowser, $, appSettings) {
function getUserViews(userId) { function getUserViews(userId) {
@ -163,10 +163,55 @@
html += getLibraryButtonsHtml(items); html += getLibraryButtonsHtml(items);
html += '</div>'; html += '</div>';
elem.innerHTML = html; return getAppInfo().then(function (infoHtml) {
elem.innerHTML = html + infoHtml;
handleLibraryLinkNavigations(elem); 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;
});
} }
function loadRecentlyAdded(elem, user) { function loadRecentlyAdded(elem, user) {
@ -395,13 +440,16 @@
html += '</div>'; html += '</div>';
} }
elem.innerHTML = html; return getAppInfo().then(function (infoHtml) {
elem.innerHTML = html + infoHtml;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
LibraryBrowser.createCardMenus(elem, { showDetailsMenu: false }); LibraryBrowser.createCardMenus(elem, { showDetailsMenu: false });
handleLibraryLinkNavigations(elem); handleLibraryLinkNavigations(elem);
}); });
});
} }
function loadResume(elem, userId) { function loadResume(elem, userId) {

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CommonIO" version="1.0.0.9" targetFramework="net45" /> <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="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
<package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" /> <package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" />
</packages> </packages>