diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index 86c64de64d..e1696997da 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -126,7 +126,7 @@
return false;
}
- return true;
+ return !AppInfo.isTouchPreferred;
}
function enabled() {
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js
index 5ad8de4a07..2db195c572 100644
--- a/dashboard-ui/scripts/channels.js
+++ b/dashboard-ui/scripts/channels.js
@@ -19,8 +19,6 @@
var html = '';
- updateFilterControls(page);
-
var view = 'Thumb';
if (view == "Thumb") {
@@ -59,10 +57,6 @@
});
}
- function updateFilterControls(page) {
-
- }
-
function loadTab(page, index) {
switch (index) {
@@ -70,7 +64,6 @@
case 1:
LibraryBrowser.loadSavedQueryValues('channels', query);
reloadItems(page);
- updateFilterControls(page);
break;
default:
break;
@@ -84,7 +77,7 @@
var tabs = page.querySelector('paper-tabs');
var pages = page.querySelector('neon-animated-pages');
- LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages);
+ LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 1);
$(tabs).on('iron-select', function () {
var selected = this.selected;
diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js
index 68a7ece872..4b51470077 100644
--- a/dashboard-ui/scripts/channelslatest.js
+++ b/dashboard-ui/scripts/channelslatest.js
@@ -2,7 +2,11 @@
function reloadItems(page) {
- Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId());
+ Dashboard.showLoadingMsg();
+
+ Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId()).always(function() {
+ Dashboard.hideLoadingMsg();
+ });
}
function loadTab(page, index) {
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 52e69ff043..f514551bde 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -1534,7 +1534,9 @@
tabs.hideScrollButtons = true;
- $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
+ $(ownerpage).on('pagebeforeshowready', function() {
+ LibraryBrowser.onTabbedPageBeforeShowReady(this);
+ });
$(pages).on('iron-select', function () {
diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js
index a2729199e2..0d20399b57 100644
--- a/dashboard-ui/scripts/homenextup.js
+++ b/dashboard-ui/scripts/homenextup.js
@@ -67,8 +67,7 @@
preferThumb: true,
showDetailsMenu: true,
centerText: true,
- overlayPlayButton: AppInfo.enableAppLayouts,
- fullWidthOnMobile: AppInfo.enableAppLayouts
+ overlayPlayButton: AppInfo.enableAppLayouts
});
}
diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js
index 7f4971a59e..f40451e509 100644
--- a/dashboard-ui/scripts/homeupcoming.js
+++ b/dashboard-ui/scripts/homeupcoming.js
@@ -117,7 +117,8 @@
preferThumb: true,
context: 'tv',
lazy: true,
- showDetailsMenu: true
+ showDetailsMenu: true,
+ centerText: true
});
html += '
';
diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 45d8581978..8dd267a805 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -76,8 +76,6 @@
}
}
- var viblastKey = 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI=';
-
function requireViblast(callback) {
require(['thirdparty/viblast/viblast.js'], function () {
@@ -91,7 +89,7 @@
function downloadViblastKey(callback) {
- var savedKeyPropertyName = 'viblastkey';
+ var savedKeyPropertyName = 'vbk';
var savedKey = appStorage.getItem(savedKeyPropertyName);
if (savedKey) {
var deferred = DeferredBuilder.Deferred();
@@ -118,7 +116,8 @@
}
function getViblastKey() {
- return htmlMediaRenderer.customViblastKey || viblastKey;
+
+ return htmlMediaRenderer.customViblastKey || 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI=';
}
function getStartTime(url) {
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index e80d94259c..a794597370 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -855,8 +855,7 @@
overlayText: true,
lazy: true,
showDetailsMenu: true,
- overlayPlayButton: AppInfo.enableAppLayouts,
- fullWidthOnMobile: AppInfo.enableAppLayouts
+ overlayPlayButton: AppInfo.enableAppLayouts
});
}
else if (item.Type == "GameSystem") {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5711c9fcc2..bbbbc477e2 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -189,7 +189,7 @@
return !LibraryBrowser.enableFullPaperTabs();
},
- configurePaperLibraryTabs: function (ownerpage, tabs, pages) {
+ configurePaperLibraryTabs: function (ownerpage, tabs, pages, defaultTabIndex) {
tabs.hideScrollButtons = true;
@@ -235,7 +235,9 @@
$('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight');
}
- $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
+ $(ownerpage).on('pagebeforeshowready', function () {
+ LibraryBrowser.onTabbedPageBeforeShowReady(ownerpage, defaultTabIndex);
+ });
$(pages).on('iron-select', function () {
@@ -249,8 +251,7 @@
});
},
- onTabbedPageBeforeShowReady: function () {
- var page = this;
+ onTabbedPageBeforeShowReady: function (page, defaultTabIndex) {
var tabs = page.querySelector('paper-tabs');
var selected = tabs.selected;
@@ -259,7 +260,12 @@
Logger.log('selected tab is null, checking query string');
- selected = parseInt(getParameterByName('tab') || '0');
+ if (!LibraryBrowser.enableFullPaperTabs()) {
+ // Currently not supported in this mode
+ defaultTabIndex = null;
+ }
+
+ selected = parseInt(getParameterByName('tab')) || defaultTabIndex || 0;
Logger.log('selected tab will be ' + selected);
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 65ba9f5363..fc12fab329 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -407,10 +407,10 @@
if (self.supportsTextTracks()) {
if (isVlc) {
- //profile.SubtitleProfiles.push({
- // Format: 'srt',
- // Method: 'External'
- //});
+ profile.SubtitleProfiles.push({
+ Format: 'srt',
+ Method: 'External'
+ });
profile.SubtitleProfiles.push({
Format: 'srt',
Method: 'Embed'
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index 65638c685e..2aab58a729 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -101,7 +101,13 @@
var currentTimeout = searchHintTimeout;
Dashboard.showLoadingMsg();
- ApiClient.getSearchHints({ userId: Dashboard.getCurrentUserId(), searchTerm: searchTerm, limit: 30 }).done(function (result) {
+ ApiClient.getSearchHints({
+
+ userId: Dashboard.getCurrentUserId(),
+ searchTerm: searchTerm,
+ limit: 30
+
+ }).done(function (result) {
if (currentTimeout == searchHintTimeout) {
renderSearchResultsInOverlay(elem, result.SearchHints);
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
index 6172e984cc..d5a7405cbd 100644
--- a/dashboard-ui/scripts/tvlatest.js
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -64,8 +64,7 @@
centerText: true,
lazy: true,
showTitle: false,
- overlayPlayButton: AppInfo.enableAppLayouts,
- fullWidthOnMobile: AppInfo.enableAppLayouts
+ overlayPlayButton: AppInfo.enableAppLayouts
});
}
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index bc4c5f35d1..735daac847 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -86,8 +86,7 @@
preferThumb: true,
showDetailsMenu: true,
centerText: true,
- overlayPlayButton: AppInfo.enableAppLayouts,
- fullWidthOnMobile: AppInfo.enableAppLayouts
+ overlayPlayButton: AppInfo.enableAppLayouts
});
}
@@ -152,7 +151,8 @@
lazy: true,
cardLayout: true,
context: 'tv',
- showDetailsMenu: true
+ showDetailsMenu: true,
+ preferThumb: true
});
} else if (view == 'Poster') {
@@ -162,11 +162,11 @@
shape: getThumbShape(),
showTitle: true,
showParentTitle: true,
- overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
lazy: true,
context: 'tv',
showDetailsMenu: true,
- overlayPlayButton: true
+ overlayPlayButton: true,
+ preferThumb: true
});
}
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 1229120656..f221d51770 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -1,6 +1,6 @@
(function ($, document) {
- var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
+ var view = LibraryBrowser.getDefaultItemsView('Poster', 'Thumb');
var data = {};
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 4154d9641a..df0974fec2 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -111,7 +111,8 @@
preferThumb: true,
context: 'tv',
lazy: true,
- showDetailsMenu: true
+ showDetailsMenu: true,
+ centerText: true
});
html += '
';
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index 8d24167d7b..1bb9f1a266 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -59,9 +59,13 @@ html, body, .ui-btn, .pageTitle {
}
.libraryViewNav .ui-btn-active, .libraryViewNav .iron-selected, .barsMenuButton .fa, .btnActiveCast, .libraryViewNav a:not(.ui-btn-active):hover {
- color: #E91E63 !important;
+ color: #FF2D55 !important;
}
+.viewMenuBar paper-icon-button {
+ color: #FF2D55 !important;
+}
+
.libraryViewNav {
border-top: 1px solid #333 !important;
}