From c761f8d6220ef7eecca78071752ef457dfe9e441 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 1 Nov 2016 14:29:18 -0400 Subject: [PATCH] update components --- .../emby-apiclient/.bower.json | 8 +++--- .../emby-apiclient/connectionmanager.js | 2 +- .../emby-button/emby-button.css | 2 +- dashboard-ui/css/librarymenu.css | 8 +----- dashboard-ui/css/site.css | 1 + dashboard-ui/scripts/encodingsettings.js | 7 ++++- dashboard-ui/scripts/librarymenu.js | 28 +------------------ 7 files changed, 15 insertions(+), 41 deletions(-) diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 233587ba7..190eaf6ec 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.92", - "_release": "1.1.92", + "version": "1.1.93", + "_release": "1.1.93", "_resolution": { "type": "version", - "tag": "1.1.92", - "commit": "0a48f9a0b64a422c4466938b24aa983041a89f52" + "tag": "1.1.93", + "commit": "b8af5e03c6181c45ff28070b01a5bab4650a7292" }, "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "^1.1.51", diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js index 01a67ddb9..e263eb7e0 100644 --- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js @@ -216,7 +216,7 @@ return connectUser; }; - var minServerVersion = '3.0.6040'; + var minServerVersion = '3.0.7000'; self.minServerVersion = function (val) { if (val) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css index 8f623792e..c4632a35f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css @@ -152,7 +152,7 @@ .paper-icon-button-light > i { width: 1em; height: 1em; - font-size: 1.6em; + font-size: 1.7em; /* Make sure its on top of the ripple */ position: relative; z-index: 1; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 4f35057bf..9a12ec22f 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -238,14 +238,8 @@ body:not(.dashboardDocument) .btnNotifications { margin-left: 1.6em; } -i.sidebarLinkIcon { - font-size: 114%; - height: auto; - width: auto; -} - .darkDrawer i.sidebarLinkIcon { - margin-left: 1.7em; + margin-left: 1.9em; } .darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index e52d11dc6..290782f2a 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -229,6 +229,7 @@ div[data-role='page'] { color: #111 !important; font-weight: 500 !important; vertical-align: middle; + font-size: 110%; } .sidebarLink:hover { diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js index a45fa8941..211bd36c6 100644 --- a/dashboard-ui/scripts/encodingsettings.js +++ b/dashboard-ui/scripts/encodingsettings.js @@ -188,7 +188,12 @@ ApiClient.getSystemInfo().then(function (systemInfo) { - page.querySelector('.fldSelectEncoderPathType').classList.remove('hide'); + if (systemInfo.EncoderLocationType == "External") { + page.querySelector('.fldSelectEncoderPathType').classList.add('hide'); + } else { + page.querySelector('.fldSelectEncoderPathType').classList.remove('hide'); + } + loadPage(page, config, systemInfo); }); }); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index d947a1861..6076a151e 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -402,33 +402,7 @@ return apiClient.getUserViews({}, userId).then(function (result) { - var items = result.Items; - - var list = []; - - for (var i = 0, length = items.length; i < length; i++) { - - var view = items[i]; - - list.push(view); - - if (view.CollectionType == 'livetv') { - - view.ImageTags = {}; - view.icon = 'live_tv'; - view.onclick = "LibraryBrowser.showTab('livetv.html', 0);"; - - var guideView = Object.assign({}, view); - guideView.Name = Globalize.translate('ButtonGuide'); - guideView.ImageTags = {}; - guideView.icon = 'dvr'; - guideView.url = 'livetv.html?tab=1'; - guideView.onclick = "LibraryBrowser.showTab('livetv.html', 1);"; - list.push(guideView); - } - } - - return list; + return result.Items; }); }