diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 79419a1a0b..da8028736a 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.63", - "_release": "1.4.63", + "version": "1.4.64", + "_release": "1.4.64", "_resolution": { "type": "version", - "tag": "1.4.63", - "commit": "c557118405664924ccb91634f8dcf9aa2667bcb1" + "tag": "1.4.64", + "commit": "171ff7d10d89cb335d98fcfddd34d7d1bf4ebd19" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browser.js b/dashboard-ui/bower_components/emby-webcomponents/browser.js index 476da407a0..bb64e7b349 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browser.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browser.js @@ -28,6 +28,40 @@ return false; } + function isStyleSupported(prop, value) { + // If no value is supplied, use "inherit" + value = arguments.length === 2 ? value : 'inherit'; + // Try the native standard method first + if ('CSS' in window && 'supports' in window.CSS) { + return window.CSS.supports(prop, value); + } + // Check Opera's native method + if ('supportsCSS' in window) { + return window.supportsCSS(prop, value); + } + + // need try/catch because it's failing on tizen + + try { + // Convert to camel-case for DOM interactions + var camel = prop.replace(/-([a-z]|[0-9])/ig, function (all, letter) { + return (letter + '').toUpperCase(); + }); + // Check if the property is supported + var support = (camel in el.style); + // Create test element + var el = document.createElement('div'); + // Assign the property and value to invoke + // the CSS interpreter + el.style.cssText = prop + ':' + value; + // Ensure both the property and value are + // supported and return + return support && (el.style[camel] !== ''); + } catch (err) { + return false; + } + } + var uaMatch = function (ua) { ua = ua.toLowerCase(); @@ -106,7 +140,11 @@ browser.tv = isTv(); browser.operaTv = browser.tv && userAgent.toLowerCase().indexOf('opr/') != -1; - browser.noFlex = (browser.tv && !browser.chrome && !browser.operaTv) || browser.ps4; + if (!isStyleSupported('display', 'flex')) { + browser.noFlex = true; + } + + //browser.noFlex = (browser.tv && !browser.chrome && !browser.operaTv) || browser.ps4; return browser; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index f0167baf13..9784e3a3b7 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.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "f36b38928849ef3853db727faa8c9ef104d611eb" }, - "_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-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 01c5a1084b..955c9dc566 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.5.2", "commit": "18e8e12dcd9a4560de480562f65935feed334b86" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 2239c885b3..93dda46e57 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -22,7 +22,7 @@ IsMissing: false, IsVirtualUnaired: false, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb", + EnableImageTypes: "Primary,Backdrop,Thumb", StartIndex: 0, Limit: pageSize }, diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js index a14cc7d14c..8f0ce8fbed 100644 --- a/dashboard-ui/scripts/homenextup.js +++ b/dashboard-ui/scripts/homenextup.js @@ -8,7 +8,7 @@ Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo", UserId: Dashboard.getCurrentUserId(), ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb" + EnableImageTypes: "Primary,Backdrop,Thumb" }; return ApiClient.getNextUpEpisodes(query); diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js index 54be1863a2..2dc1873191 100644 --- a/dashboard-ui/scripts/homeupcoming.js +++ b/dashboard-ui/scripts/homeupcoming.js @@ -7,7 +7,7 @@ var query = { Limit: 40, - Fields: "AirTime,UserData,SeriesStudio,SyncInfo", + Fields: "AirTime,UserData,SyncInfo", UserId: Dashboard.getCurrentUserId(), ImageTypeLimit: 1, EnableImageTypes: "Primary,Backdrop,Banner,Thumb", @@ -110,7 +110,6 @@ showLocationTypeIndicator: false, shape: getThumbShape(), showTitle: true, - showPremiereDate: true, preferThumb: true, lazy: true, showDetailsMenu: true, diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 83f5ed1fc5..d8f08b116e 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1330,7 +1330,7 @@ }); } - else if (item.AlbumId && item.SeriesPrimaryImageTag) { + else if (item.SeriesId && item.SeriesPrimaryImageTag) { imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, { type: "Primary", @@ -1993,18 +1993,9 @@ enableImageEnhancers: enableImageEnhancers }); - } else if (options.preferThumb && imageItem.SeriesThumbImageTag && options.inheritThumb !== false) { - - imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, { - type: "Thumb", - maxWidth: thumbWidth, - tag: imageItem.SeriesThumbImageTag, - enableImageEnhancers: enableImageEnhancers - }); - } else if (options.preferThumb && imageItem.ParentThumbItemId && options.inheritThumb !== false) { - imgUrl = ApiClient.getThumbImageUrl(imageItem.ParentThumbItemId, { + imgUrl = ApiClient.getScaledImageUrl(imageItem.ParentThumbItemId, { type: "Thumb", maxWidth: thumbWidth, enableImageEnhancers: enableImageEnhancers @@ -2100,15 +2091,6 @@ enableImageEnhancers: enableImageEnhancers }); - } else if (imageItem.SeriesThumbImageTag) { - - imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, { - type: "Thumb", - maxWidth: thumbWidth, - tag: imageItem.SeriesThumbImageTag, - enableImageEnhancers: enableImageEnhancers - }); - } else if (imageItem.ParentThumbItemId) { imgUrl = ApiClient.getThumbImageUrl(imageItem, { @@ -2539,6 +2521,8 @@ getPremiereDateText: function (item, date) { + var studio = (item.Studios || [])[0]; + if (!date) { var text = ''; @@ -2547,12 +2531,12 @@ text += item.AirTime; } - if (item.SeriesStudio) { + if (studio) { if (text) { - text += " on " + item.SeriesStudio; + text += " on " + studio; } else { - text += item.SeriesStudio; + text += studio; } } @@ -2565,8 +2549,8 @@ day += " at " + item.AirTime; } - if (item.SeriesStudio) { - day += " on " + item.SeriesStudio; + if (studio) { + day += " on " + studio; } return day; diff --git a/dashboard-ui/scripts/searchpage.js b/dashboard-ui/scripts/searchpage.js index c15feae70a..6df9d0b40d 100644 --- a/dashboard-ui/scripts/searchpage.js +++ b/dashboard-ui/scripts/searchpage.js @@ -187,10 +187,15 @@ }); view.addEventListener('viewbeforeshow', function (e) { + document.body.classList.add('hiddenViewMenuBar'); + document.body.classList.add('hiddenNowPlayingBar'); LibraryMenu.setMenuButtonVisible(false); }); view.addEventListener('viewbeforehide', function (e) { + + document.body.classList.remove('hiddenViewMenuBar'); + document.body.classList.remove('hiddenNowPlayingBar'); LibraryMenu.setMenuButtonVisible(true); }); diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 4e42d0d1e4..9915361d8e 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -21,7 +21,7 @@ Limit: 100, StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb" + EnableImageTypes: "Primary" } }; diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js index 36b0d86091..dac577b3eb 100644 --- a/dashboard-ui/scripts/tvlatest.js +++ b/dashboard-ui/scripts/tvlatest.js @@ -20,7 +20,7 @@ Fields: "PrimaryImageAspectRatio,SyncInfo", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb" + EnableImageTypes: "Primary,Backdrop,Thumb" }; return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)); diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index 1aa465677b..fa2f231323 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -30,7 +30,7 @@ Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo", UserId: Dashboard.getCurrentUserId(), ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb" + EnableImageTypes: "Primary,Backdrop,Thumb" }; query.ParentId = LibraryMenu.getTopParentId(); @@ -108,7 +108,7 @@ ExcludeLocationTypes: "Virtual", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb", + EnableImageTypes: "Primary,Backdrop,Thumb", EnableTotalRecordCount: false }; diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index 0110b7759a..6d6d79df2e 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -7,7 +7,7 @@ var query = { Limit: 40, - Fields: "AirTime,UserData,SeriesStudio,SyncInfo", + Fields: "AirTime,UserData,SyncInfo", UserId: Dashboard.getCurrentUserId(), ImageTypeLimit: 1, EnableImageTypes: "Primary,Backdrop,Banner,Thumb", @@ -112,7 +112,6 @@ showLocationTypeIndicator: false, shape: getThumbShape(), showTitle: true, - showPremiereDate: true, preferThumb: true, lazy: true, showDetailsMenu: true, diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html index 9f53a05e08..bfb284eedb 100644 --- a/dashboard-ui/search.html +++ b/dashboard-ui/search.html @@ -1,19 +1,30 @@ -
+
- -
+
-
-
- search -
- -
-
+
+