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

Merge pull request #1940 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-07-13 16:50:51 -04:00 • committed by GitHub
commit 9a193ece2b
8 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.77",
"_release": "1.4.77",
"version": "1.4.78",
"_release": "1.4.78",
"_resolution": {
"type": "version",
"tag": "1.4.77",
"commit": "22897eca3cd924d46ea6b612b8959b6bc8912f7c"
"tag": "1.4.78",
"commit": "33c9381ec8872ebd87e46def5a2b86dcbf952f0d"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

4
dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js vendored
View file

@ -998,7 +998,9 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa
dragSourceElement.addEventListener(eventName, dragInitSlidee);
});
window.addEventListener('resize', onResize, true);
if (!o.scrollWidth) {
window.addEventListener('resize', onResize, true);
}
if (!o.horizontal) {
addEventListenerWithOptions(frameElement, 'scroll', resetScroll, {

12
dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json vendored
View file

@ -1,10 +1,10 @@
{
"NoItemsFound": "No items found.",
"HeaderSaySomethingLike": "Say Something Like...",
"HeaderYouSaid": "You Said...",
"MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
"ButtonTryAgain": "Try Again",
"MessageWeDidntRecognizeCommand": "We're sorry, we didn't recognize that command.",
"NoItemsFound": "No se encontraron \u00edtems.",
"HeaderSaySomethingLike": "Decir Algo Como...",
"HeaderYouSaid": "Ha Dicho...",
"MessageIfYouBlockedVoice": "Si ha negado el acceso por voz a la aplicaci\u00f3n necesitara reconfigurar antes de intentarlo de nuevo.",
"ButtonTryAgain": "Intentar de Nuevo",
"MessageWeDidntRecognizeCommand": "Lo sentimos, no reconocimos ese comando.",
"ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Compartir",
"ServerUpdateNeeded": "Este Servidor Emby necesita ser actualizado. Para descargar la ultima versi\u00f3n, por favor visite {0}",

12
dashboard-ui/bower_components/emby-webcomponents/strings/nl.json vendored
View file

@ -1,10 +1,10 @@
{
"NoItemsFound": "No items found.",
"HeaderSaySomethingLike": "Say Something Like...",
"HeaderYouSaid": "You Said...",
"MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
"ButtonTryAgain": "Try Again",
"MessageWeDidntRecognizeCommand": "We're sorry, we didn't recognize that command.",
"NoItemsFound": "Geen items gevonden.",
"HeaderSaySomethingLike": "Zeg iets zoals...",
"HeaderYouSaid": "U zei...",
"MessageIfYouBlockedVoice": "Als u spraak toegang uitgeschakeld heeft moet u dit opnieuw configureren voordat u verder gaat.",
"ButtonTryAgain": "Probeer opnieuw",
"MessageWeDidntRecognizeCommand": "Sorry, dat commando herkennen we niet.",
"ValueSpecialEpisodeName": "Speciaal - {0}",
"Share": "Delen",
"ServerUpdateNeeded": "Deze Emby Server moet worden bijgewerkt. Om de laatste versie te downloaden, gaat u naar {0}",

14
dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js vendored
View file

@ -4,16 +4,16 @@ define(['appSettings', 'apiClientResolver', 'events'], function (appsettings, ap
var self = this;
function getUserId() {
function getUserId(apiClient) {
if (configuredUserId) {
return configuredUserId;
}
var apiClient = apiClientResolver();
var apiClientInstance = apiClient || apiClientResolver();
if (apiClient) {
return apiClient.getCurrentUserId();
if (apiClientInstance) {
return apiClientInstance.getCurrentUserId();
}
return null;
@ -86,13 +86,15 @@ define(['appSettings', 'apiClientResolver', 'events'], function (appsettings, ap
self.serverConfig = function (config) {
var apiClient = apiClientResolver();
if (config) {
return apiClientResolver().updateUserConfiguration(getUserId(), config);
return apiClient.updateUserConfiguration(getUserId(apiClient), config);
} else {
return apiClientResolver().getUser(getUserId()).then(function (user) {
return apiClient.getUser(getUserId(apiClient)).then(function (user) {
return user.Configuration;
});

2
dashboard-ui/bower_components/emby-webcomponents/voice/voice.css vendored
View file

@ -1,5 +1,5 @@
.voiceHelpContent {
max-width: 700px;
max-width: 600px;
margin: auto;
}

17
dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js vendored
View file

@ -108,13 +108,13 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb
removeOnClose: true
});
dlg.classList.add('ui-body-b');
dlg.classList.add('background-theme-b');
dlg.classList.add('formDialog');
var html = '';
html += '<div class="dialogHeader" style="margin:0 0 1em;">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize btnCancelVoiceInput" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle" id="voiceDialogGroupName">';
html += '<div class="dialogHeader" style="margin:0 0 2em;">';
html += '<button is="paper-icon-button-light" class="btnCancelVoiceInput autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle">';
//html += title;
html += '</div>';
html += '</div>';
@ -126,7 +126,7 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb
html += '<div class="defaultVoiceHelp">';
html += '<h1 style="margin-bottom:1.25em;">' + globalize.translate('sharedcomponents#HeaderSaySomethingLike') + '</h1>';
html += '<h1 style="margin-bottom:1.25em;margin-top:0;">' + globalize.translate('sharedcomponents#HeaderSaySomethingLike') + '</h1>';
html += '<div class="exampleCommands">';
html += '</div>';
@ -135,7 +135,7 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb
html += '</div>';
html += '<div class="unrecognizedCommand hide">';
html += '<h1>' + globalize.translate('sharedcomponents#HeaderYouSaid') + '</h1>';
html += '<h1 style="margin-top:0;">' + globalize.translate('sharedcomponents#HeaderYouSaid') + '</h1>';
html +=
'<p class="exampleCommand voiceInputContainer"><i class="fa fa-quote-left"></i><span class="voiceInputText exampleCommandText"></span><i class="fa fa-quote-right"></i></p>';
html += '<p>' + globalize.translate('sharedcomponents#MessageWeDidntRecognizeCommand') + '</p>';
@ -150,9 +150,6 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb
html += '</div>';
html +=
'<button is="emby-button" type="button" class="raised block btnCancelVoiceInput cancel"><i class="md-icon">close</i><span>' + globalize.translate('sharedcomponents#ButtonCancel') + '</span></button>';
html += '</div>';
html += '</div>';
html += '</div>';

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

@ -112,6 +112,13 @@
html = libraryBrowser.getPosterViewHtml(posterOptions);
}
else if (viewStyle == "List") {
html = libraryBrowser.getListViewHtml({
items: result.Items,
sortBy: query.SortBy
});
}
else if (viewStyle == "Thumb") {
posterOptions.preferThumb = true;
@ -259,7 +266,7 @@
var btnSelectView = view.querySelector('.btnSelectView');
btnSelectView.addEventListener('click', function (e) {
libraryBrowser.showLayoutMenu(e.target, getPageData().view, 'Poster,PosterCard,Thumb'.split(','));
libraryBrowser.showLayoutMenu(e.target, getPageData().view, 'List,Poster,PosterCard,Thumb'.split(','));
});
btnSelectView.addEventListener('layoutchange', function (e) {