From cbca3a20ae5b9d3cf53f17321fcb5009e1a278d6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 24 Aug 2016 02:13:15 -0400 Subject: [PATCH] reduce rescanning due to IsOffline --- .../emby-webcomponents/.bower.json | 8 +-- .../emby-webcomponents/cardbuilder/card.css | 15 ++--- .../cardbuilder/cardbuilder.js | 4 +- .../cardbuilder/peoplecardbuilder.js | 2 +- .../itemidentifier/itemidentifier.js | 2 +- .../emby-webcomponents/router.js | 5 ++ .../bower_components/polymer/.bower.json | 6 +- dashboard-ui/components/apphost.js | 58 +++++++++++++++++-- dashboard-ui/css/site.css | 2 +- dashboard-ui/encodingsettings.html | 3 + dashboard-ui/scripts/camerauploadsettings.js | 11 +--- dashboard-ui/scripts/connectlogin.js | 10 ++-- dashboard-ui/scripts/dashboardpage.js | 2 +- dashboard-ui/scripts/encodingsettings.js | 19 ++++++ dashboard-ui/scripts/librarymenu.js | 7 +-- dashboard-ui/scripts/loginpage.js | 2 +- dashboard-ui/scripts/medialibrarypage.js | 2 +- dashboard-ui/scripts/mediaplayer-video.js | 2 +- dashboard-ui/scripts/plugincatalogpage.js | 2 +- dashboard-ui/scripts/pluginspage.js | 2 +- dashboard-ui/scripts/site.js | 12 ---- dashboard-ui/scripts/userprofilespage.js | 4 +- dashboard-ui/strings/en-US.json | 3 +- 23 files changed, 115 insertions(+), 68 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c4a7d2d932..c19dd451fc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.182", - "_release": "1.4.182", + "version": "1.4.183", + "_release": "1.4.183", "_resolution": { "type": "version", - "tag": "1.4.182", - "commit": "d4c701ce17ff5a243470cf9cae99babde51f7179" + "tag": "1.4.183", + "commit": "0548902d94131fb45ba17c421186014b0bed5e18" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index 9407e53f0b..fc5bccd0fc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -36,7 +36,7 @@ justify-content: center; } - .vertical-wrap .card { + .vertical-wrap > .card { contain: layout style; } @@ -135,19 +135,18 @@ position: relative; background-clip: content-box !important; color: #fff; + /* This is only needed for scalable cards */ + height: 100%; } @media all and (min-width: 600px) { .cardImageContainer { + /* Should be 0 with visualCardBox, but not really noticeable */ border-radius: 2px; } } -.visualCardBox .cardImageContainer { - border-radius: 0; -} - .chapterCardImageContainer { background-color: #000; border-radius: 0; @@ -178,10 +177,6 @@ display: block; } -.scalableCard .cardImageContainer { - height: 100%; -} - .cardImage { position: absolute; top: 0; @@ -206,7 +201,7 @@ padding: .5em .3em; } -.visualCardBox .cardScalable, .visualCardBox-cardFooter { +.visualCardBox-cardScalable, .visualCardBox-cardFooter { background-color: #222326; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 775efbee76..4d954e4842 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -1133,7 +1133,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo cardContentClose = ''; } cardImageContainerOpen = imgUrl ? ('
') : ('
'); - cardImageContainerOpen = '
' + cardContentOpen + cardImageContainerOpen; + + var cardScalableClass = options.cardLayout ? 'cardScalable visualCardBox-cardScalable' : 'cardScalable'; + cardImageContainerOpen = '
' + cardContentOpen + cardImageContainerOpen; cardBoxClose = '
'; cardScalableClose = '
'; cardImageContainerClose = '
'; diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js index b3b404d8ad..dd6d926c9f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js @@ -86,7 +86,7 @@ define(['imageLoader', 'itemShortcuts', 'connectionManager', 'layoutManager'], f var html = '\