From 946e1d91bb41d2d49272ccc75824b1269510e6a6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 Jul 2016 14:23:01 -0400 Subject: [PATCH 1/3] update components --- .../emby-webcomponents/.bower.json | 8 ++++---- .../emby-webcomponents/scroller/smoothscroller.js | 4 +++- .../emby-webcomponents/strings/es-MX.json | 12 ++++++------ .../emby-webcomponents/strings/nl.json | 12 ++++++------ .../usersettings/usersettingsbuilder.js | 14 ++++++++------ .../emby-webcomponents/voice/voice.css | 2 +- .../emby-webcomponents/voice/voicedialog.js | 15 ++++++--------- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 558d97f1c6..3080f5b978 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -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", diff --git a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js index 7e418862d2..2d14680fda 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js +++ b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js @@ -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, { diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json index 881ce52e8d..a03bcaeca6 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json @@ -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}", diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json index f23e344bec..66e1996118 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json @@ -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}", diff --git a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js index f612080911..f45f155ebc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js @@ -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; }); diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voice.css b/dashboard-ui/bower_components/emby-webcomponents/voice/voice.css index a155574a86..307b3e0036 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/voice/voice.css +++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voice.css @@ -1,5 +1,5 @@ .voiceHelpContent { - max-width: 700px; + max-width: 600px; margin: auto; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js index 76ce4c31e4..db5ce9ee82 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js +++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js @@ -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 += '
'; - html += ''; - html += '
'; + html += '
'; + html += ''; + html += '
'; + //html += title; html += '
'; html += '
'; @@ -126,7 +126,7 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb html += '
'; - html += '

' + globalize.translate('sharedcomponents#HeaderSaySomethingLike') + '

'; + html += '

' + globalize.translate('sharedcomponents#HeaderSaySomethingLike') + '

'; html += '
'; html += '
'; @@ -150,9 +150,6 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb html += '
'; - html += - ''; - html += '
'; html += '
'; html += ''; From 6291a9b69ad1ff1ba490a2682c8a6436978cfb5d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 Jul 2016 15:09:45 -0400 Subject: [PATCH 2/3] add list view to item list page --- dashboard-ui/scripts/itemlistpage.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index d0da7cb585..0365e84600 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -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) { From 8ed2f06e67194b651746ce1ebe84c89c8b6739ce Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 Jul 2016 15:21:42 -0400 Subject: [PATCH 3/3] update voice dialog --- .../bower_components/emby-webcomponents/voice/voicedialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js index db5ce9ee82..dee43a6dd3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js +++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js @@ -135,7 +135,7 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb html += ''; html += '
'; - html += '

' + globalize.translate('sharedcomponents#HeaderYouSaid') + '

'; + html += '

' + globalize.translate('sharedcomponents#HeaderYouSaid') + '

'; html += '

'; html += '

' + globalize.translate('sharedcomponents#MessageWeDidntRecognizeCommand') + '

';