diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 76ca18330e..cd84d89754 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.157", - "_release": "1.4.157", + "version": "1.4.158", + "_release": "1.4.158", "_resolution": { "type": "version", - "tag": "1.4.157", - "commit": "7ec475515f1b5a785c764864221b53d9b63d8151" + "tag": "1.4.158", + "commit": "ffda5994565e3f458e9da09c168cfce699237a0f" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js index a1e785bf95..507f7e489c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js @@ -347,7 +347,7 @@ return true; } - return true; + return browser.touch; } function centerDialog(dlg) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js index 11eb5bae32..aef77a7037 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js @@ -136,7 +136,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter', }); } - if (playbackManager.canQueueMediaType(item.MediaType)) { + if (playbackManager.canQueue(item)) { if (options.queue !== false) { commands.push({ name: globalize.translate('sharedcomponents#Queue'), diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.css b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.css index 4c9de1a5bc..0a2bbdb75e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.css +++ b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.css @@ -14,6 +14,7 @@ padding: .5em; color: #fff; text-align: left; + font-size: 90%; } .cardOverlayMediaInfo { diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css index 293eae81fa..3ebb18a3c3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css +++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css @@ -58,17 +58,17 @@ button.listItem { flex-direction: column; vertical-align: middle; justify-content: center; - min-height: 48px; + min-height: 3.44em; } .two-line { - min-height: 72px; + min-height: 5.15em; padding-top: 0; padding-bottom: 0; } .three-line { - min-height: 88px; + min-height: 6.3em; padding-top: 0; padding-bottom: 0; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js b/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js index 9f93841d3a..e9dc2c289d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js +++ b/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js @@ -28,9 +28,14 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir } function resetRegistration() { - navigator.serviceWorker.ready.then(function (registration) { - serviceWorkerRegistration = registration; - }); + + var serviceWorker = navigator.serviceWorker; + + if (serviceWorker) { + serviceWorker.ready.then(function (registration) { + serviceWorkerRegistration = registration; + }); + } } resetRegistration(); diff --git a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js index 72552cade0..ec2892bede 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js @@ -51,7 +51,7 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings' }); } - if (playbackManager.canQueueMediaType(mediaType)) { + if (playbackManager.canQueue(item)) { menuItems.push({ name: globalize.translate('sharedcomponents#Queue'), id: 'queue' diff --git a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js index 94fd6d85fd..ba9d12d31a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js +++ b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js @@ -170,12 +170,7 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa // transform is the only way to guarantee animation options.enableNativeScroll = false; } - else if (browser.edge && (!browser.xboxOne && !browser.touch)) { - // no scrolling supported - options.enableNativeScroll = false; - } - else if (layoutManager.desktop || - !browser.animate) { + else if (layoutManager.desktop || !browser.animate) { options.enableNativeScroll = true; } @@ -899,19 +894,24 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa return; } var delta = normalizeWheelDelta(event); - // Trap scrolling only when necessary and/or requested - if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) { - //stopDefault(event, 1); - } if (transform) { + // Trap scrolling only when necessary and/or requested + if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) { + //stopDefault(event, 1); + } + self.slideBy(o.scrollBy * delta); } else { + if (isSmoothScrollSupported) { + delta *= 12; + } + if (o.horizontal) { - slideeElement.scrollLeft += 12 * delta; + slideeElement.scrollLeft += delta; } else { - slideeElement.scrollTop += 12 * delta; + slideeElement.scrollTop += delta; } } } diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index eeaddfa5df..f3338bba57 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-icon", + "homepage": "https://github.com/PolymerElements/iron-icon", "_release": "1.0.9", "_resolution": { "type": "version", "tag": "v1.0.9", "commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d" }, - "_source": "git://github.com/polymerelements/iron-icon.git", + "_source": "git://github.com/PolymerElements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icon" + "_originalSource": "PolymerElements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index e1304d174b..f4bfef4a7c 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index a96f0f050e..25eb84c037 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -32,14 +32,14 @@ "iron-component-page": "polymerElements/iron-component-page#^1.1.6" }, "private": true, - "homepage": "https://github.com/Polymer/polymer", + "homepage": "https://github.com/polymer/polymer", "_release": "1.6.1", "_resolution": { "type": "version", "tag": "v1.6.1", "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" }, - "_source": "git://github.com/Polymer/polymer.git", + "_source": "git://github.com/polymer/polymer.git", "_target": "^1.1.0", - "_originalSource": "Polymer/polymer" + "_originalSource": "polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css index 03360cc097..ff7a8514fb 100644 --- a/dashboard-ui/css/dashboard.css +++ b/dashboard-ui/css/dashboard.css @@ -78,7 +78,7 @@ paper-input + .fieldDescription { .dashboardDocument .mainDrawer { z-index: 998 !important; - top: 65px !important; + top: 58px !important; left: 0 !important; transform: none !important; } diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 0c7ee44562..3582212bbf 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -220,22 +220,26 @@ align-items: center; } -.dashboardDocument .viewMenuBar { - background-color: #333; - height: auto; +.dashboardDocument { + font-size: 13px; } - .dashboardDocument .viewMenuBar .primaryIcons { - padding: .7em 0; + .dashboardDocument .viewMenuBar { + background-color: #333; + height: auto; } -.dashboardDocument.withTallToolbar .primaryIcons { - padding-bottom: 0; -} + .dashboardDocument .viewMenuBar .primaryIcons { + padding: .7em 0; + } -.dashboardDocument .viewMenuBar #selectionBar { - height: 3px; -} + .dashboardDocument.withTallToolbar .primaryIcons { + padding-bottom: 0; + } + + .dashboardDocument .viewMenuBar #selectionBar { + height: 3px; + } .viewMenuBarTabs { width: 100%; diff --git a/dashboard-ui/devices/android/android.css b/dashboard-ui/devices/android/android.css index 162c44548a..200bf4b333 100644 --- a/dashboard-ui/devices/android/android.css +++ b/dashboard-ui/devices/android/android.css @@ -1,7 +1,8 @@ @media all and (min-width: 300px) { - .libraryViewNav { + .libraryViewNav, .libraryViewNav > .contentScrollSlider { display: flex; + flex-grow: 1; } .libraryViewNav .pageTabButton { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index bed2642c34..54f008b303 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -272,7 +272,9 @@ clickBar: 1, //centerOffset: window.innerWidth * .05, hiddenScroll: true, - requireAnimation: true + + // In safari the transform is causing the headers to occasionally disappear or flicker + requireAnimation: !browserInfo.safari }); tabs.scroller.init(); } else { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 93f38d7823..82fa5017d3 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1344,7 +1344,7 @@ var AppInfo = {}; howler: bowerPath + '/howler.js/howler.min', sortable: bowerPath + '/Sortable/Sortable.min', isMobile: bowerPath + '/isMobile/isMobile.min', - headroom: bowerPath + '/headroom.js/dist/headroom.min', + headroom: bowerPath + '/headroom.js/dist/headroom', masonry: bowerPath + '/masonry/dist/masonry.pkgd.min', humanedate: 'components/humanedate', libraryBrowser: 'scripts/librarybrowser', @@ -1647,6 +1647,9 @@ var AppInfo = {}; canPlay: function (item) { return MediaController.canPlay(item); }, + canQueue: function (item) { + return MediaController.canQueueMediaType(item.MediaType, item.Type); + }, instantMix: function (item) { return MediaController.instantMix(item); },