diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index 6a1c63c094..0b4d98b29a 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -6,7 +6,6 @@
-
${TabDisplay}
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 5d9cd4d0fd..e3194a1323 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -6,8 +6,6 @@
-
-
${TabDisplay}
${TabPlayback}
diff --git a/dashboard-ui/playlistedit.html b/dashboard-ui/playlistedit.html
index dd8613f3b3..c55ef483b4 100644
--- a/dashboard-ui/playlistedit.html
+++ b/dashboard-ui/playlistedit.html
@@ -13,34 +13,14 @@
-
-
-
-
+
+
${ButtonPlay}
${MessageNoPlaylistItemsAvailable}
-
-
diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js
new file mode 100644
index 0000000000..0b812566bb
--- /dev/null
+++ b/dashboard-ui/scripts/actionsheet.js
@@ -0,0 +1,15 @@
+(function () {
+
+ function show(options) {
+
+ // items
+ // positionTo
+ // showCancel
+
+ }
+
+ window.ActionSheet = {
+ show: show
+ };
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index 5f2e81588c..646a781c2a 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -129,7 +129,7 @@
}
if ($.browser.android && AppInfo.isNativeApp) {
- return true;
+ return screen.availWidth >= 1200;
}
if ($.browser.mobile) {
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 5b5a4f5c6a..8d97c44426 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -256,7 +256,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#channelItemsPage", function () {
+ }).on('pagebeforeshowready', "#channelItemsPage", function () {
var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js
index 6f615ae7b8..04ad855e73 100644
--- a/dashboard-ui/scripts/channels.js
+++ b/dashboard-ui/scripts/channels.js
@@ -61,7 +61,7 @@
}
- $(document).on('pageshowready', "#channelsPage", function () {
+ $(document).on('pagebeforeshowready', "#channelsPage", function () {
LibraryBrowser.loadSavedQueryValues('channels', query);
diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js
index 63eca5776f..6e5dc2615c 100644
--- a/dashboard-ui/scripts/channelslatest.js
+++ b/dashboard-ui/scripts/channelslatest.js
@@ -5,7 +5,7 @@
Sections.loadLatestChannelItems($(".items", page), Dashboard.getCurrentUserId());
}
- $(document).on('pageshowready', "#channelsLatestPage", function () {
+ $(document).on('pagebeforeshowready', "#channelsLatestPage", function () {
reloadItems(this);
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index 7b40ed76a1..b9329a7600 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -321,7 +321,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#episodesPage", function () {
+ }).on('pagebeforeshowready', "#episodesPage", function () {
var page = this;
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js
index 24f8dddc2b..1ad2255aed 100644
--- a/dashboard-ui/scripts/favorites.js
+++ b/dashboard-ui/scripts/favorites.js
@@ -109,7 +109,7 @@
});
}
- $(document).on('pageshowready', "#favoritesPage", function () {
+ $(document).on('pagebeforeshowready', "#favoritesPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index 802683800d..4ac17609a6 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -96,7 +96,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#gameGenresPage", function () {
+ }).on('pagebeforeshowready', "#gameGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index d082261e4d..d29e3006f7 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -239,7 +239,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#gamesPage", function () {
+ }).on('pagebeforeshowready', "#gamesPage", function () {
var page = this;
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js
index d8f4655996..6d82262f20 100644
--- a/dashboard-ui/scripts/gamesrecommendedpage.js
+++ b/dashboard-ui/scripts/gamesrecommendedpage.js
@@ -1,6 +1,6 @@
(function ($, document) {
- $(document).on('pageshowready', "#gamesRecommendedPage", function () {
+ $(document).on('pagebeforeshowready', "#gamesRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId();
var userId = Dashboard.getCurrentUserId();
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index f85bf82aac..b926ae5347 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -98,7 +98,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#gameStudiosPage", function () {
+ }).on('pagebeforeshowready', "#gameStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js
index 1b7cba7f7b..ec0a8a95ff 100644
--- a/dashboard-ui/scripts/gamesystemspage.js
+++ b/dashboard-ui/scripts/gamesystemspage.js
@@ -52,7 +52,7 @@
// Reset form values using the last used query
}
- $(document).on('pageshowready', "#gamesystemsPage", function () {
+ $(document).on('pagebeforeshowready', "#gamesystemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 5ef6ce070e..ad50c70ba1 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -170,7 +170,7 @@
takeTour(page, Dashboard.getCurrentUserId());
});
- }).on('pageshowready', "#indexPage", function () {
+ }).on('pagebeforeshowready', "#indexPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 7cad7f798f..8796b9edfc 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -587,7 +587,7 @@
});
});
- }).on('pageshowready', "#itemByNameDetailPage", function () {
+ }).on('pagebeforeshowready', "#itemByNameDetailPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index e0041aa782..6af94ec863 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1627,7 +1627,7 @@
});
- }).on('pageshowready', "#itemDetailPage", function () {
+ }).on('pagebeforeshowready', "#itemDetailPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index a0dcc0dbe6..a132d773cc 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -244,7 +244,7 @@
$(page).on('click', '.mediaItem', onListItemClick);
- }).on('pageshowready', "#itemListPage", function () {
+ }).on('pagebeforeshowready', "#itemListPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 536bd22b76..895fd193e9 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2,8 +2,6 @@
var pageSizeKey = 'pagesize_v4';
- var defaultBackground = "#333";
-
return {
getDefaultPageSize: function (key, defaultValue) {
@@ -1214,7 +1212,6 @@
var html = '';
var imgUrl = null;
var icon;
- var background = null;
var width = null;
var height = null;
@@ -1222,6 +1219,8 @@
var enableImageEnhancers = options.enableImageEnhancers !== false;
+ var cssClass = "card";
+
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
width = posterWidth;
@@ -1386,7 +1385,7 @@
if (item.Name && options.showTitle) {
icon = 'fa-music';
}
- background = defaultBackground;
+ cssClass += " defaultBackground";
} else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
@@ -1394,28 +1393,26 @@
icon = 'fa-folder-open';
}
- background = defaultBackground;
+ cssClass += " defaultBackground";
} else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
if (item.Name && options.showTitle) {
icon = 'fa-video-camera';
}
- background = defaultBackground;
+ cssClass += " defaultBackground";
} else if (item.Type == "Person") {
if (item.Name && options.showTitle) {
icon = 'fa-user';
}
- background = defaultBackground;
+ cssClass += " defaultBackground";
} else {
if (item.Name && options.showTitle) {
icon = 'fa-folder-open';
}
- background = defaultBackground;
+ cssClass += " defaultBackground";
}
- var cssClass = "card";
-
cssClass += ' ' + options.shape + 'Card';
var mediaSourceCount = item.MediaSourceCount || 1;
@@ -1453,10 +1450,6 @@
style += 'background-image:url(\'' + imgUrl + '\');';
}
- if (background) {
- style += "background-color:" + background + ";";
- }
-
var imageCssClass = 'cardImage';
if (icon) {
@@ -2129,12 +2122,15 @@
if (options.viewButton) {
+ //html += '
';
html += '
';
}
html += '
';
if (showControls && options.showLimit !== false) {
+
+ require(['jqmicons']);
var id = "selectPageSize";
var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections();
diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js
index 056681dd96..bf286af509 100644
--- a/dashboard-ui/scripts/livetvchannel.js
+++ b/dashboard-ui/scripts/livetvchannel.js
@@ -176,7 +176,7 @@
Dashboard.navigate("edititemmetadata.html?channelid=" + currentItem.Id);
});
- }).on('pageshowready', "#liveTvChannelPage", function () {
+ }).on('pagebeforeshowready', "#liveTvChannelPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index 7418e9ede7..377579f1f5 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -109,7 +109,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#liveTvChannelsPage", function () {
+ }).on('pagebeforeshowready', "#liveTvChannelsPage", function () {
// Can't use pagebeforeshow here or the loading popup won't center correctly
var page = this;
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 2a862352e7..2c7a75d936 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -478,7 +478,7 @@
reloadPage(page);
});
- }).on('pageshowready', "#liveTvGuidePage", function () {
+ }).on('pagebeforeshowready', "#liveTvGuidePage", function () {
var page = this;
reloadPage(page);
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 83e5388353..1ed17e4d6d 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -137,7 +137,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#liveTvItemsPage", function () {
+ }).on('pagebeforeshowready', "#liveTvItemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js
index 40483d1876..0ac8499a46 100644
--- a/dashboard-ui/scripts/livetvprogram.js
+++ b/dashboard-ui/scripts/livetvprogram.js
@@ -121,7 +121,7 @@
deleteTimer(page, currentItem.TimerId);
});
- }).on('pageshowready', "#liveTvProgramPage", function () {
+ }).on('pagebeforeshowready', "#liveTvProgramPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index ae367fe963..bdee1fba0b 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -84,7 +84,7 @@
var page = this;
- }).on('pageshowready', "#liveTvRecordingListPage", function () {
+ }).on('pagebeforeshowready', "#liveTvRecordingListPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 3e8dc548ca..16f9b62983 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -102,7 +102,7 @@
});
}
- $(document).on('pageshowready', "#liveTvRecordingsPage", function () {
+ $(document).on('pagebeforeshowready', "#liveTvRecordingsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index fc363ef21b..4992375b36 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -116,7 +116,7 @@
}).checkboxradio('refresh');
}
- $(document).on('pageshowready', "#liveTvSeriesTimersPage", function () {
+ $(document).on('pagebeforeshowready', "#liveTvSeriesTimersPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index b3649f6789..6dc391f4ad 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -104,7 +104,7 @@
});
}
- $(document).on('pageshowready', "#liveTvSuggestedPage", function () {
+ $(document).on('pagebeforeshowready', "#liveTvSuggestedPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index d318ea12db..4a93c45bfd 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -107,7 +107,7 @@
});
}
- $(document).on('pageshowready', "#liveTvTimersPage", function () {
+ $(document).on('pagebeforeshowready', "#liveTvTimersPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index cb2e475063..15f7743cac 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -122,6 +122,7 @@
throw new Error('null player');
}
+ currentPairingId = null;
currentPlayer = player;
currentTargetInfo = targetInfo;
@@ -745,12 +746,14 @@
html += '
';
html += '
';
- html += '
' + Globalize.translate('ButtonRemoteControl') + '
';
+ html += '
' + Globalize.translate('ButtonRemoteControl') + '
';
html += '
';
$(document.body).append(html);
+ require(['jqmicons']);
+
var elem = $('#playerSelectionPanel').panel({}).trigger('create').panel("open").on("panelclose", function () {
$(this).off("panelclose").remove();
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 639f815ac4..a3a425f093 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -37,17 +37,12 @@
var html = '';
- var addiontalButtonsHtml = user.Policy.IsAdministrator ?
- ('
') :
- '';
-
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
viewButton: true,
showLimit: false,
- additionalButtonsHtml: addiontalButtonsHtml
})).trigger('create');
updateFilterControls(page);
@@ -257,7 +252,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#boxsetsPage", function () {
+ }).on('pagebeforeshowready', "#boxsetsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index b81a8b8c44..ebddc2e359 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -154,7 +154,7 @@
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
});
- }).on('pageshowready', "#movieGenresPage", function () {
+ }).on('pagebeforeshowready', "#movieGenresPage", function () {
var page = this;
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js
index 36176ce991..32027e2b54 100644
--- a/dashboard-ui/scripts/moviepeople.js
+++ b/dashboard-ui/scripts/moviepeople.js
@@ -140,7 +140,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#moviePeoplePage", function () {
+ }).on('pagebeforeshowready', "#moviePeoplePage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index af90dd7961..a60c5ffd0b 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -399,7 +399,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#moviesPage", function () {
+ }).on('pagebeforeshowready', "#moviesPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 397e1b6d62..f20efcfe04 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -235,7 +235,7 @@
$('.recommendations', page).createCardMenus();
- }).on('pageshowready', "#moviesRecommendedPage", function () {
+ }).on('pagebeforeshowready', "#moviesRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js
index e973ba517b..3842c6a756 100644
--- a/dashboard-ui/scripts/moviestudios.js
+++ b/dashboard-ui/scripts/moviestudios.js
@@ -99,7 +99,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#movieStudiosPage", function () {
+ }).on('pagebeforeshowready', "#movieStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 53683433ec..1806f58c25 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -212,7 +212,7 @@
$('.popupTrailerReelForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#movieTrailersPage", function () {
+ }).on('pagebeforeshowready', "#movieTrailersPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index b34b9cd684..a17c1c94ea 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -190,7 +190,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#musicAlbumArtistsPage", function () {
+ }).on('pagebeforeshowready', "#musicAlbumArtistsPage", function () {
var page = this;
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index d94abeb3cb..17fcdc7798 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -242,7 +242,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#musicAlbumsPage", function () {
+ }).on('pagebeforeshowready', "#musicAlbumsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index a4214a9fed..90839a9c3e 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -191,7 +191,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#musicArtistsPage", function () {
+ }).on('pagebeforeshowready', "#musicArtistsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js
index a737e18c82..1748c14714 100644
--- a/dashboard-ui/scripts/musicgenres.js
+++ b/dashboard-ui/scripts/musicgenres.js
@@ -115,7 +115,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#musicGenresPage", function () {
+ }).on('pagebeforeshowready', "#musicGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 45a3d33e05..67f88d1cdf 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -167,7 +167,7 @@
});
}
- $(document).on('pageshowready', "#musicRecommendedPage", function () {
+ $(document).on('pagebeforeshowready', "#musicRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js
index 05a27a2684..28f4146c71 100644
--- a/dashboard-ui/scripts/musicvideos.js
+++ b/dashboard-ui/scripts/musicvideos.js
@@ -183,7 +183,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#musicVideosPage", function () {
+ }).on('pagebeforeshowready', "#musicVideosPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/mypreferenceswebclient.js b/dashboard-ui/scripts/mypreferenceswebclient.js
index aab149c7a2..48bade203c 100644
--- a/dashboard-ui/scripts/mypreferenceswebclient.js
+++ b/dashboard-ui/scripts/mypreferenceswebclient.js
@@ -41,7 +41,7 @@
ApiClient.updateDisplayPreferences('home', displayPreferences, userId, 'webclient').done(function () {
Dashboard.alert(Globalize.translate('SettingsSaved'));
-
+ Dashboard.hideLoadingMsg();
});
}
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js
index 17e00add2e..3ec6cf54cf 100644
--- a/dashboard-ui/scripts/nowplayingpage.js
+++ b/dashboard-ui/scripts/nowplayingpage.js
@@ -722,7 +722,7 @@
$('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit);
$('.typeTextForm').off('submit', NowPlayingPage.onSendStringSubmit).on('submit', NowPlayingPage.onSendStringSubmit);
- }).on('pageshowready', "#nowPlayingPage", function () {
+ }).on('pagebeforeshowready', "#nowPlayingPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index 328166f603..16b75cc61b 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -282,7 +282,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#photosPage", function () {
+ }).on('pagebeforeshowready', "#photosPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 5cb5d5ee4b..c3517ce2ae 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -81,8 +81,9 @@
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
- viewButton: true,
- showLimit: false
+ showLimit: false,
+ updatePageSizeSetting: false
+
})).trigger('create');
updateFilterControls(page);
@@ -171,20 +172,12 @@
}).checkboxradio('refresh');
$('#selectView', page).val(view).selectmenu('refresh');
-
- $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
}
$(document).on('pageinitdepends', "#playlistEditorPage", function () {
var page = this;
- $('#selectPageSize', page).on('change', function () {
- query.Limit = parseInt(this.value);
- query.StartIndex = 0;
- reloadItems(page);
- });
-
$('.btnPlay', page).on('click', function () {
var userdata = currentItem.UserData || {};
@@ -215,7 +208,7 @@
});
- }).on('pageshowready', "#playlistEditorPage", function () {
+ }).on('pagebeforeshowready', "#playlistEditorPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js
index f834e77eac..7fb95735c9 100644
--- a/dashboard-ui/scripts/playlists.js
+++ b/dashboard-ui/scripts/playlists.js
@@ -183,7 +183,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#playlistsPage", function () {
+ }).on('pagebeforeshowready', "#playlistsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index b512f270d8..33cd511db6 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -321,13 +321,11 @@
function handleLibraryLinkNavigations(elem) {
- $('a.posterItem', elem).on('click', function () {
+ $('a', elem).on('click', function () {
- var textElem = $('.posterItemText span', this);
+ var card = $(this).parents('.card');
+ var textElem = $('.cardText', card);
- if (!textElem.length) {
- textElem = $('.posterItemText', this);
- }
var text = textElem.html();
LibraryMenu.setText(text);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 27984de668..3b311b13f2 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -50,7 +50,7 @@ var Dashboard = {
$.event.special.swipe.verticalDistanceThreshold = 40;
$.mobile.loader.prototype.options.disabled = true;
- $.mobile.page.prototype.options.domCache = true;
+ //$.mobile.page.prototype.options.domCache = true;
$.mobile.loadingMessage = false;
$.mobile.loader.prototype.options.html = "";
@@ -1735,6 +1735,10 @@ var AppInfo = {};
window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities);
+ if (getWindowUrl().toLowerCase().indexOf('wizardstart.html') != -1) {
+ window.ConnectionManager.clearData();
+ }
+
$(ConnectionManager).on('apiclientcreated', function (e, newApiClient) {
initializeApiClient(newApiClient);
@@ -1795,6 +1799,8 @@ var AppInfo = {};
if (AppInfo.isTouchPreferred) {
elem.addClass('touch');
+ } else {
+ elem.addClass('pointerInput');
}
if (AppInfo.cardMargin) {
@@ -1829,8 +1835,13 @@ var AppInfo = {};
function onDocumentReady() {
// Do these now to prevent a flash of content
- if (AppInfo.isNativeApp && $.browser.safari) {
- Dashboard.importCss('themes/ios.css');
+ if (AppInfo.isNativeApp) {
+ if ($.browser.android) {
+ Dashboard.importCss('themes/android.css');
+ }
+ else if ($.browser.safari) {
+ Dashboard.importCss('themes/ios.css');
+ }
}
if ($.browser.safari && $.browser.mobile) {
@@ -2038,6 +2049,7 @@ var AppInfo = {};
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
return {};
});
+ define("actionsheet", ["scripts/actionsheet"]);
//requirejs(['http://viblast.com/player/free-version/qy2fdwajo1/viblast.js']);
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index de696a1ff7..9c60835826 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -174,7 +174,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#songsPage", function () {
+ }).on('pagebeforeshowready', "#songsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index d9ebc4cb8d..0c0aa3b4eb 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -169,7 +169,7 @@
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
});
- }).on('pageshowready', "#tvGenresPage", function () {
+ }).on('pagebeforeshowready', "#tvGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
var page = this;
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
index a6b2643ece..ab673fd518 100644
--- a/dashboard-ui/scripts/tvlatest.js
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -5,7 +5,7 @@
return 'Thumb';
}
- $(document).on('pageshowready', "#tvNextUpPage", function () {
+ $(document).on('pagebeforeshowready', "#tvNextUpPage", function () {
var userId = Dashboard.getCurrentUserId();
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index f846e679f9..06220ad0f7 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -147,7 +147,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#tvPeoplePage", function () {
+ }).on('pagebeforeshowready', "#tvPeoplePage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index c01ff8c2ba..0c132dfa08 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -360,7 +360,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#tvShowsPage", function () {
+ }).on('pagebeforeshowready', "#tvShowsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js
index 1fea2042de..202d7d4513 100644
--- a/dashboard-ui/scripts/tvstudios.js
+++ b/dashboard-ui/scripts/tvstudios.js
@@ -108,7 +108,7 @@
reloadItems(page);
});
- }).on('pageshowready', "#tvStudiosPage", function () {
+ }).on('pagebeforeshowready', "#tvStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index f7eac4065b..a2d2b6798e 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -6,8 +6,6 @@
-
-
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css
new file mode 100644
index 0000000000..7ca8f3e7b2
--- /dev/null
+++ b/dashboard-ui/themes/android.css
@@ -0,0 +1,15 @@
+.viewMenuBar, .libraryViewNav {
+ background-color: #181818;
+}
+
+.ui-page-theme-b {
+ background-color: #282828;
+}
+
+.backdropPage.ui-page-theme-b {
+ background-color: rgba(20, 20,20, .94) !important;
+}
+
+.defaultBackground .cardImage {
+ background-color: #383838;
+}
\ No newline at end of file
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index c22ae5c594..175d3cdc09 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -8,6 +8,10 @@
background-color: rgba(28,28,28,.97);
}
+.backdropPage.ui-page-theme-b {
+ background-color: rgba(28,28,28,.92) !important;
+}
+
.ui-page-theme-b {
background-color: #1c1c1c;
}
@@ -130,3 +134,15 @@ h1, h1 a {
.libraryViewNav a:not(.ui-btn-active):hover {
color: #539FFD !important;
}
+
+@media (min-width: 600px) {
+
+ /* This needs a little extra space to account for the longer date format */
+ .channelHeaderCell, .channelTimeslotHeader {
+ width: 209px;
+ }
+
+ .programGrid, .timeslotHeaders {
+ margin-left: 210px;
+ }
+}
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 709e1a89e2..6d9162ec12 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -171,7 +171,6 @@
});
var existingServer = existingServers.length ? existingServers[0] : {};
-
existingServer.DateLastAccessed = new Date().getTime();
existingServer.LastConnectionMode = MediaBrowser.ConnectionMode.Manual;
existingServer.ManualAddress = apiClient.serverAddress();
@@ -204,6 +203,18 @@
});
};
+ self.clearData = function () {
+
+ logger.log('connection manager clearing data');
+
+ connectUser = null;
+ var credentials = credentialProvider.credentials();
+ credentials.ConnectAccessToken = null;
+ credentials.ConnectUserId = null;
+ credentials.Servers = [];
+ credentialProvider.credentials(credentials);
+ };
+
function onConnectUserSignIn(user) {
connectUser = user;
diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js
index f7ee4cf26a..1590f953ae 100644
--- a/dashboard-ui/thirdparty/cordova/chromecast.js
+++ b/dashboard-ui/thirdparty/cordova/chromecast.js
@@ -634,14 +634,13 @@
$(MediaController).on('playerchange', function (e, newPlayer, newTarget) {
- if (currentDevice) {
- if (newTarget.id != currentDeviceId) {
- if (currentWebAppSession) {
- console.log('Disconnecting from chromecast');
- //currentDevice.disconnect();
- currentDevice = null;
- currentDeviceId = null;
- }
+ if (newTarget.id != currentDeviceId) {
+ if (currentWebAppSession) {
+ console.log('Disconnecting from chromecast');
+ //currentDevice.disconnect();
+ cleanupSession();
+ currentDevice = null;
+ currentDeviceId = null;
}
}
});
@@ -657,9 +656,7 @@
}
}
- if (!$.browser.safari) {
- document.addEventListener("resume", onResume, false);
- }
+ document.addEventListener("resume", onResume, false);
}
MediaController.registerPlayer(new chromecastPlayer());
diff --git a/dashboard-ui/thirdparty/cordova/generaldevice.js b/dashboard-ui/thirdparty/cordova/generaldevice.js
index 5943ae1a76..ce035f1966 100644
--- a/dashboard-ui/thirdparty/cordova/generaldevice.js
+++ b/dashboard-ui/thirdparty/cordova/generaldevice.js
@@ -647,6 +647,7 @@
if (currentDevice) {
console.log('Disconnecting from connect device');
//currentDevice.disconnect();
+ cleanupSession();
currentDevice = null;
currentDeviceId = null;
currentMediaControl = null;
diff --git a/dashboard-ui/thirdparty/iron-icons/emby-icons.html b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
index 34d7bde822..7beff542b3 100644
--- a/dashboard-ui/thirdparty/iron-icons/emby-icons.html
+++ b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
@@ -38,6 +38,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
+
@@ -48,5 +49,9 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
+
+
+
+
diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js
index b7ff745df2..3bb47b54c4 100644
--- a/dashboard-ui/thirdparty/jquery.unveil-custom.js
+++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js
@@ -20,7 +20,7 @@
// Need to fix those before this can be set to 0
if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) {
- return 10000;
+ return 8000;
}
var screens = $.browser.mobile ? 2 : 1;
diff --git a/dashboard-ui/thirdparty/paper-button/paper-button-style.css b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
index 0c97bb8655..7a9d347fde 100644
--- a/dashboard-ui/thirdparty/paper-button/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
@@ -55,11 +55,11 @@
}
.ui-page-theme-b paper-button.subdued:not([disabled]) {
- color: #555;
+ color: #484848;
}
.ui-page-theme-b paper-button[raised].subdued:not([disabled]) {
- background: #555;
+ background: #484848;
color: #fff;
}
diff --git a/dashboard-ui/thirdparty/paper-fab/paper-fab.html b/dashboard-ui/thirdparty/paper-fab/paper-fab.html
new file mode 100644
index 0000000000..f607ca4711
--- /dev/null
+++ b/dashboard-ui/thirdparty/paper-fab/paper-fab.html
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index f4920aa1d0..5b44d5efe4 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -5,7 +5,6 @@
-
info${TabSuggestions}
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index bdaedccf36..ca4e297173 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -6,8 +6,6 @@
-
-
home${TabHome}
new_releases${TabLatest}
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 4c60a188bd..15e17b8ca8 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -6,8 +6,6 @@