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

update tabs

This commit is contained in:
Luke Pulverenti 2016-06-04 13:14:03 -04:00
parent 71c9ecf157
commit 467ff3657f
16 changed files with 82 additions and 76 deletions

View file

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.17", "version": "1.4.18",
"_release": "1.4.17", "_release": "1.4.18",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.17", "tag": "1.4.18",
"commit": "26ee95baf54887c88d2aadf768ded7aa75a65fb7" "commit": "39d5a6a55acf536c14945385fbce917516fe23ea"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -57,13 +57,14 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
var self = {}; var self = {};
var enableFade = browser.animate && !browser.mobile && !browser.operaTv; var enableFade = browser.animate && !browser.mobile && !browser.operaTv;
function fillImage(elem, source, enableEffects) { function fillImage(elem, source, enableEffects) {
if (!source) { if (!source) {
source = elem.getAttribute('data-src'); source = elem.getAttribute('data-src');
} }
if (source) { if (source) {
if (enableFade && enableEffects !== false) { if (enableFade && !layoutManager.tv && enableEffects !== false) {
imageFetcher.loadImage(elem, source).then(fadeIn); imageFetcher.loadImage(elem, source).then(fadeIn);
} else { } else {
imageFetcher.loadImage(elem, source); imageFetcher.loadImage(elem, source);

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Playlist:", "LabelPlaylist": "Playlist:",
"AddToPlaylist": "Add to Playlist", "AddToPlaylist": "Add to Playlist",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Wiedergabeliste", "LabelPlaylist": "Wiedergabeliste",
"AddToPlaylist": "Zur Wiedergabeliste hinzuf\u00fcgen", "AddToPlaylist": "Zur Wiedergabeliste hinzuf\u00fcgen",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Lista de Reproducci\u00f3n:", "LabelPlaylist": "Lista de Reproducci\u00f3n:",
"AddToPlaylist": "Agregar a lista de reproducci\u00f3n", "AddToPlaylist": "Agregar a lista de reproducci\u00f3n",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -69,15 +69,15 @@
"OptionNew": "\u0416\u0430\u04a3\u0430...", "OptionNew": "\u0416\u0430\u04a3\u0430...",
"LabelPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456:", "LabelPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456:",
"AddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443", "AddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443",
"Subtitles": "Subtitles", "Subtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u0456\u0437\u0434\u0435\u0443",
"LabelLanguage": "Language:", "LabelLanguage": "\u0422\u0456\u043b:",
"Search": "Search", "Search": "\u0406\u0437\u0434\u0435\u0443",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "\u0415\u0448\u049b\u0430\u043d\u0434\u0430\u0439 \u043d\u04d9\u0442\u0438\u0436\u0435\u043b\u0435\u0440 \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
"File": "File", "File": "\u0424\u0430\u0439\u043b",
"MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?", "MessageAreYouSureDeleteSubtitles": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u043e\u0441\u044b \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0444\u0430\u0439\u043b\u044b\u043d \u0436\u043e\u044e \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
"ConfirmDeletion": "Confirm Deletion", "ConfirmDeletion": "\u0416\u043e\u044e\u0434\u044b \u0440\u0430\u0441\u0442\u0430\u0443",
"MySubtitles": "My Subtitles", "MySubtitles": "\u041c\u0435\u043d\u0456\u04a3 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0456\u043c",
"MessageDownloadQueued": "Download queued.", "MessageDownloadQueued": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u043a\u0435\u0437\u0435\u043a\u0442\u0435.",
"EditSubtitles": "Edit Subtitles" "EditSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u04e9\u04a3\u0434\u0435\u0443"
} }

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Spilleliste:", "LabelPlaylist": "Spilleliste:",
"AddToPlaylist": "Legg til i Spilleliste", "AddToPlaylist": "Legg til i Spilleliste",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Playlist:", "LabelPlaylist": "Playlist:",
"AddToPlaylist": "Add to Playlist", "AddToPlaylist": "Add to Playlist",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -70,7 +70,7 @@
"LabelPlaylist": "Lista de Reprodu\u00e7\u00e3o:", "LabelPlaylist": "Lista de Reprodu\u00e7\u00e3o:",
"AddToPlaylist": "Adicionar \u00e0 lista de reprodu\u00e7\u00e3o", "AddToPlaylist": "Adicionar \u00e0 lista de reprodu\u00e7\u00e3o",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "Search for Subtitles",
"LabelLanguage": "Language:", "LabelLanguage": "Language:",
"Search": "Search", "Search": "Search",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "No results found.",

View file

@ -69,15 +69,15 @@
"OptionNew": "\u041d\u043e\u0432\u043e\u0435...", "OptionNew": "\u041d\u043e\u0432\u043e\u0435...",
"LabelPlaylist": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442:", "LabelPlaylist": "\u041f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442:",
"AddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442", "AddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043f\u043b\u0435\u0439-\u043b\u0438\u0441\u0442",
"Subtitles": "Subtitles", "Subtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
"DownloadSubtitles": "Download Subtitles", "SearchForSubtitles": "\u041f\u043e\u0438\u0441\u043a \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432",
"LabelLanguage": "Language:", "LabelLanguage": "\u042f\u0437\u044b\u043a:",
"Search": "Search", "Search": "\u041f\u043e\u0438\u0441\u043a",
"NoSubtitleSearchResultsFound": "No results found.", "NoSubtitleSearchResultsFound": "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.",
"File": "File", "File": "\u0424\u0430\u0439\u043b",
"MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?", "MessageAreYouSureDeleteSubtitles": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0444\u0430\u0439\u043b \u0441\u0443\u0431\u0438\u0442\u0440\u043e\u0432?",
"ConfirmDeletion": "Confirm Deletion", "ConfirmDeletion": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f",
"MySubtitles": "My Subtitles", "MySubtitles": "\u041c\u043e\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
"MessageDownloadQueued": "Download queued.", "MessageDownloadQueued": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0432 \u043e\u0447\u0435\u0440\u0435\u0434\u0438.",
"EditSubtitles": "Edit Subtitles" "EditSubtitles": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b"
} }

View file

@ -770,7 +770,7 @@ prevent = dy > dx;
prevent = dx > dy; prevent = dx > dy;
} }
if (prevent) { if (prevent) {
//ev.preventDefault(); ev.preventDefault();
} else { } else {
Gestures.prevent('track'); Gestures.prevent('track');
} }

View file

@ -1,4 +1,4 @@
<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs"> <div id="libraryDisplayPage" data-role="page" class="page type-interior librarySectionPage withTabs">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -1,4 +1,4 @@
<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox,paper-button"> <div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -146,8 +146,45 @@
}]; }];
} }
$(document).on('pageshow', "#librarySettingsPage", function () { return function (view, params) {
var self = this;
$('#btnSelectMetadataPath', view).on("click.selectDirectory", function () {
require(['directorybrowser'], function (directoryBrowser) {
var picker = new directoryBrowser();
picker.show({
callback: function (path) {
if (path) {
$('#txtMetadataPath', view).val(path);
}
picker.close();
},
header: Globalize.translate('HeaderSelectMetadataPath'),
instruction: Globalize.translate('HeaderSelectMetadataPathHelp')
});
});
});
$('.librarySettingsForm').off('submit', onSubmit).on('submit', onSubmit);
ApiClient.getSystemInfo().then(function (systemInfo) {
if (systemInfo.SupportsLibraryMonitor) {
view.querySelector('.fldLibraryMonitor').classList.remove('hide');
} else {
view.querySelector('.fldLibraryMonitor').classList.add('hide');
}
});
view.addEventListener('viewshow', function () {
LibraryMenu.setTabs('librarysetup', 3, getTabs); LibraryMenu.setTabs('librarysetup', 3, getTabs);
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -175,44 +212,7 @@
loadChapters(page, responses[0], responses[1]); loadChapters(page, responses[0], responses[1]);
}); });
}).on('pageinit', "#librarySettingsPage", function () {
var page = this;
$('#btnSelectMetadataPath', page).on("click.selectDirectory", function () {
require(['directorybrowser'], function (directoryBrowser) {
var picker = new directoryBrowser();
picker.show({
callback: function (path) {
if (path) {
$('#txtMetadataPath', page).val(path);
}
picker.close();
},
header: Globalize.translate('HeaderSelectMetadataPath'),
instruction: Globalize.translate('HeaderSelectMetadataPathHelp')
});
});
});
$('.librarySettingsForm').off('submit', onSubmit).on('submit', onSubmit);
ApiClient.getSystemInfo().then(function (systemInfo) {
if (systemInfo.SupportsLibraryMonitor) {
page.querySelector('.fldLibraryMonitor').classList.remove('hide');
} else {
page.querySelector('.fldLibraryMonitor').classList.add('hide');
}
});
}); });
};
}); });

View file

@ -2591,9 +2591,10 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/librarysettings.html', path: '/librarysettings.html',
dependencies: [], dependencies: ['emby-collapsible', 'paper-input', 'paper-checkbox', 'paper-button'],
autoFocus: false, autoFocus: false,
roles: 'admin' roles: 'admin',
controller: 'scripts/librarysettings'
}); });
defineRoute({ defineRoute({

View file

@ -140,7 +140,11 @@
}); });
} }
$('.paging', tabContent).html(pagingHtml); var i, length;
var pagingElems = tabContent.querySelectorAll('.paging');
for (i = 0, length = pagingElems.length; i < length; i++) {
pagingElems[i].innerHTML = pagingHtml;
}
$('.btnNextPage', tabContent).on('click', function () { $('.btnNextPage', tabContent).on('click', function () {
query.StartIndex += query.Limit; query.StartIndex += query.Limit;