diff --git a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js index 2bda845a80..2293060d02 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js +++ b/dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js @@ -132,7 +132,6 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa scrollSource: null, // Element for catching the mouse wheel scrolling. Default is FRAME. scrollBy: 0, // Pixels or items to move per one mouse scroll. 0 to disable scrolling. scrollHijack: 300, // Milliseconds since last wheel event after which it is acceptable to hijack global scroll. - scrollTrap: false, // Don't bubble scrolling when hitting scrolling limits. // Dragging dragSource: null, // Selector or DOM element for catching dragging events. Default is FRAME. @@ -902,8 +901,8 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa } var delta = normalizeWheelDelta(event); // Trap scrolling only when necessary and/or requested - if (o.scrollTrap || delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) { - stopDefault(event, 1); + if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) { + //stopDefault(event, 1); } if (transform) { @@ -932,7 +931,9 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa passive: true }); - scrollSource.removeEventListener(wheelEvent, scrollHandler); + removeEventListenerWithOptions(scrollSource, wheelEvent, scrollHandler, { + passive: true + }); // Reset initialized status and return the instance self.initialized = 0; @@ -1006,14 +1007,18 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa } // Scrolling navigation - scrollSource.addEventListener(wheelEvent, scrollHandler); + addEventListenerWithOptions(scrollSource, wheelEvent, scrollHandler, { + passive: true + }); } else if (o.horizontal) { // Don't bind to mouse events with vertical scroll since the mouse wheel can handle this natively // Scrolling navigation - scrollSource.addEventListener(wheelEvent, scrollHandler); + addEventListenerWithOptions(scrollSource, wheelEvent, scrollHandler, { + passive: true + }); } // Mark instance as initialized diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 001656b0d2..3194b35f96 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -116,18 +116,6 @@ h1, h1 a { margin-top: 0; } -.visualCardBox { - background: none !important; - -moz-box-shadow: none; - -ms-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - - .visualCardBox .outerCardFooter { - padding: 0; - } - .cardImage { border-radius: 10px; } diff --git a/dashboard-ui/devices/windowsphone/wp.css b/dashboard-ui/devices/windowsphone/wp.css deleted file mode 100644 index 731a98724c..0000000000 --- a/dashboard-ui/devices/windowsphone/wp.css +++ /dev/null @@ -1,30 +0,0 @@ -.viewMenuBar { - background-color: #000; -} - -.libraryViewNav { - background-color: #161616; - box-shadow: none; - text-transform: lowercase; - font-size: 220%; -} - -.background-theme-b, .dialog.background-theme-b { - background: #161616; -} - -.pageTabButton.is-active .pageTabButtonSelectionBar { - display: none !important; -} - -.libraryViewNav .pageTabButton.is-active { - color: #52B54B !important; -} - -.libraryPage:not(.noSecondaryNavPage) { - padding-top: 105px !important; -} - -.pageWithAbsoluteTabs:not(.noSecondaryNavPage) { - padding-top: 108px !important; -} diff --git a/dashboard-ui/manifest.json b/dashboard-ui/manifest.json index 8b6e28cd04..95bc4aea38 100644 --- a/dashboard-ui/manifest.json +++ b/dashboard-ui/manifest.json @@ -5,22 +5,24 @@ "related_applications": [ { "platform": "android", - "location": "https://play.google.com/store/apps/details?id=com.mb.android", + "location": "https://play.google.com/store/apps/details?id=com.mb.android" }, { "platform": "ios", - "location": "https://itunes.apple.com/us/app/emby/id992180193?ls=1&mt=8", + "location": "https://itunes.apple.com/us/app/emby/id992180193?ls=1&mt=8" }, { "platform": "web" } ], - "icons": [ { - "src": "css/images/touchicon144.png", - "sizes": "144x144", - "type": "image/png", - "density": "3.0" - }], + "icons": [ + { + "src": "css/images/touchicon144.png", + "sizes": "144x144", + "type": "image/png", + "density": "3.0" + } + ], "display": "standalone", "theme_color": "#52B54B" } \ No newline at end of file diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index f968d24d98..fe7bdfadcc 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -394,7 +394,7 @@ var chapters = item.Chapters || []; - if (!chapters.length || !AppInfo.enableDetailPageChapters) { + if (!chapters.length) { page.querySelector('#scenesCollapsible').classList.add('hide'); } else { page.querySelector('#scenesCollapsible').classList.remove('hide'); diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js index 76e3830898..555b01ff81 100644 --- a/dashboard-ui/scripts/playlists.js +++ b/dashboard-ui/scripts/playlists.js @@ -103,7 +103,8 @@ showTitle: true, centerText: true, lazy: true, - preferThumb: true + preferThumb: true, + overlayPlayButton: true }); } else if (view == "ThumbCard") { diff --git a/dashboard-ui/scripts/shared.js b/dashboard-ui/scripts/shared.js index b6910730da..3a4632d808 100644 --- a/dashboard-ui/scripts/shared.js +++ b/dashboard-ui/scripts/shared.js @@ -40,7 +40,7 @@ var chapters = item.Chapters || []; - if (!chapters.length || !AppInfo.enableDetailPageChapters) { + if (!chapters.length) { $('#scenesCollapsible', page).hide(); } else { $('#scenesCollapsible', page).show(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 2451bc63cf..d4b01e610e 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1196,24 +1196,12 @@ var AppInfo = {}; (function () { - function isTouchDevice() { - return (('ontouchstart' in window) - || (navigator.MaxTouchPoints > 0) - || (navigator.msMaxTouchPoints > 0)); - } - function setAppInfo() { - if (isTouchDevice()) { - AppInfo.isTouchPreferred = true; - } - var isCordova = Dashboard.isRunningInCordova(); - AppInfo.enableDetailPageChapters = true; AppInfo.enableSearchInTopMenu = true; AppInfo.enableHomeFavorites = true; - AppInfo.enableNowPlayingBar = true; AppInfo.enableHomeTabs = true; AppInfo.enableNowPlayingPageBottomTabs = true; AppInfo.enableAutoSave = browserInfo.mobile; @@ -1235,22 +1223,9 @@ var AppInfo = {}; AppInfo.enableHomeFavorites = false; AppInfo.enableHomeTabs = false; AppInfo.enableNowPlayingPageBottomTabs = false; - - // Disable the now playing bar for the iphone since we already have the now playing tab at the bottom - if (navigator.userAgent.toString().toLowerCase().indexOf('iphone') != -1) { - AppInfo.enableNowPlayingBar = false; - } - - } else { - AppInfo.enableDetailPageChapters = false; } } - if (!AppInfo.hasLowImageBandwidth) { - AppInfo.enableStudioTabs = true; - AppInfo.enableTvEpisodesTab = true; - } - AppInfo.supportsExternalPlayers = true; if (isCordova) { @@ -1411,10 +1386,6 @@ var AppInfo = {}; var elem = document.documentElement; - if (AppInfo.isTouchPreferred) { - elem.classList.add('touch'); - } - if (!AppInfo.enableSupporterMembership) { elem.classList.add('supporterMembershipDisabled'); } @@ -1457,15 +1428,7 @@ var AppInfo = {}; function getBowerPath() { - var bowerPath = "bower_components"; - - // Put the version into the bower path since we can't easily put a query string param on html imports - // Emby server will handle this - if (Dashboard.isConnectMode() && !Dashboard.isRunningInCordova()) { - //bowerPath += window.dashboardVersion; - } - - return bowerPath; + return "bower_components"; } function getLayoutManager(layoutManager) { @@ -2920,8 +2883,6 @@ var AppInfo = {}; deps.push('css!devices/android/android.css'); } else if (AppInfo.isNativeApp && browserInfo.safari) { deps.push('css!devices/ios/ios.css'); - } else if (AppInfo.isNativeApp && browserInfo.edge) { - deps.push('css!devices/windowsphone/wp.css'); } loadTheme(); @@ -2992,9 +2953,7 @@ var AppInfo = {}; postInitDependencies.push('scripts/chromecast'); } - if (AppInfo.enableNowPlayingBar) { - postInitDependencies.push('scripts/nowplayingbar'); - } + postInitDependencies.push('scripts/nowplayingbar'); if (AppInfo.isNativeApp && browserInfo.safari) {