diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 9bf3a29b29..285319d136 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -80,10 +80,6 @@ margin: 8px; } -.largeCardMargin .visualCardBox { - margin: 12px; -} - .ui-page-theme-b .visualCardBox { background: rgba(45,45,45,.85); border-radius: 3px; diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 5bcd7fe84c..2ca61782fe 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1565,16 +1565,14 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .detailsMenuButtonContainer { display: inline-block; + margin-left: .5em; + margin-right: .5em; } .detailsMenuButtonContainer span { padding-left: 1em; } - .detailsMenuButtonContainer + .detailsMenuButtonContainer { - margin-left: 1em; - } - .detailsMenu h3 { padding: 0 30px; } @@ -1586,7 +1584,18 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailsMenuOverview { - max-height: 120px; + max-height: 60px; + } +} + +@media all and (min-height:540px) { + + .detailsMenuContentInner { + height: 340px; + } + + .detailsMenuOverview { + max-height: 100px; } } @@ -1597,6 +1606,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailsMenuOverview { - max-height: 220px; + max-height: 160px; } } diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html index a975cd85d8..5836c39927 100644 --- a/dashboard-ui/device.html +++ b/dashboard-ui/device.html @@ -4,7 +4,7 @@ ${TitleDevices} -
+
@@ -54,9 +54,6 @@
-
diff --git a/dashboard-ui/devices.html b/dashboard-ui/devices.html index dcdfd5561a..b2038f4cda 100644 --- a/dashboard-ui/devices.html +++ b/dashboard-ui/devices.html @@ -4,7 +4,7 @@ ${TitleDevices} -
+
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 79f44499c4..8e0f094ab5 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index 6d7c441fbd..6a0199a931 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index 2dd51720f0..ff3a5eb7aa 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html index e77a049d13..c4ef130ee3 100644 --- a/dashboard-ui/gamesrecommended.html +++ b/dashboard-ui/gamesrecommended.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index 7d96fc496f..f83c058a09 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html index 30f60eea0d..33d184c3f9 100644 --- a/dashboard-ui/gamesystems.html +++ b/dashboard-ui/gamesystems.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html index 7f200b6435..0292c2489b 100644 --- a/dashboard-ui/itemlist.html +++ b/dashboard-ui/itemlist.html @@ -4,7 +4,7 @@ -
+
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index 28ccb332b6..34bc095380 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabSongs} diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index 159c84bce1..00c2df7454 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index a4172197f8..b29e6ece89 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -16,7 +16,7 @@ }).fail(function () { - Dashboard.hideLoadingMsg(); + Dashboard.hideModalLoadingMsg(); Dashboard.alert({ message: Globalize.translate('MessageInvalidUser'), @@ -31,7 +31,7 @@ function handleConnectionResult(page, result) { - Dashboard.hideLoadingMsg(); + Dashboard.hideModalLoadingMsg(); switch (result.State) { @@ -46,7 +46,7 @@ break; case MediaBrowser.ConnectionState.ServerSignIn: { - window.location = 'login.html?serverid=' + result.Servers[0].Id; + Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id); } break; case MediaBrowser.ConnectionState.ServerSelection: diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js index 8732d95f96..fee97ebcde 100644 --- a/dashboard-ui/scripts/device.js +++ b/dashboard-ui/scripts/device.js @@ -49,7 +49,16 @@ }).done(Dashboard.processServerConfigurationUpdateResult); } - $(document).on('pageinit', "#devicePage", function () { + function onSubmit() { + var form = this; + var page = $(form).parents('.page'); + + save(page); + + return false; + } + + $(document).on('pageinitdepends', "#devicePage", function () { var page = this; @@ -71,25 +80,13 @@ }); }); + $('.deviceForm').off('submit', onSubmit).on('submit', onSubmit); - }).on('pageshow', "#devicePage", function () { + }).on('pageshown', "#devicePage", function () { var page = this; loadData(page); }); - window.DevicePage = { - - onSubmit: function () { - - var form = this; - var page = $(form).parents('.page'); - - save(page); - - return false; - } - }; - })(); \ No newline at end of file diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js index 366da370d7..3213a0339e 100644 --- a/dashboard-ui/scripts/devices.js +++ b/dashboard-ui/scripts/devices.js @@ -89,7 +89,7 @@ }); } - $(document).on('pageshow', "#devicesPage", function () { + $(document).on('pageshown', "#devicesPage", function () { var page = this; diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index b1e252e9f2..f2eecd6401 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -162,7 +162,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#episodesPage", function () { + $(document).on('pageinitdepends', "#episodesPage", function () { var page = this; @@ -327,7 +327,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#episodesPage", function () { + }).on('pageshown', "#episodesPage", function () { var page = this; query.ParentId = LibraryMenu.getTopParentId(); @@ -368,9 +368,8 @@ } }); - }).on('pageshow', "#episodesPage", function () { - updateFilterControls(this); + }); })(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index 4167efe54f..2eacd786ef 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -69,7 +69,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#gameGenresPage", function () { + $(document).on('pageinitdepends', "#gameGenresPage", function () { var page = this; @@ -96,7 +96,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#gameGenresPage", function () { + }).on('pageshown', "#gameGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -112,8 +112,6 @@ reloadItems(this); - }).on('pageshow', "#gameGenresPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 1f34e41842..c4988a73f2 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -152,7 +152,7 @@ } } - $(document).on('pageinit', "#gamesPage", function () { + $(document).on('pageinitdepends', "#gamesPage", function () { var page = this; @@ -239,7 +239,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#gamesPage", function () { + }).on('pageshown', "#gamesPage", function () { var page = this; query.ParentId = LibraryMenu.getTopParentId(); @@ -266,8 +266,6 @@ } }); - }).on('pageshow', "#gamesPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js index f709eaade0..ffeb12f54b 100644 --- a/dashboard-ui/scripts/gamesrecommendedpage.js +++ b/dashboard-ui/scripts/gamesrecommendedpage.js @@ -1,6 +1,6 @@ (function ($, document) { - $(document).on('pagebeforeshow', "#gamesRecommendedPage", function () { + $(document).on('pageshown', "#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 e7bc723183..1a5c5287a0 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -71,7 +71,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#gameStudiosPage", function () { + $(document).on('pageinitdepends', "#gameStudiosPage", function () { var page = this; @@ -98,7 +98,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#gameStudiosPage", function () { + }).on('pageshown', "#gameStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -114,8 +114,6 @@ reloadItems(this); - }).on('pageshow', "#gameStudiosPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index c8934c6524..4fcc965ee2 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('pagebeforeshow', "#gamesystemsPage", function () { + $(document).on('pageshown', "#gamesystemsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -68,8 +68,6 @@ reloadItems(this); - }).on('pageshow', "#gamesystemsPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 1156b4f951..da7b3f21fb 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -181,7 +181,7 @@ } } - $(document).on('pageinit', "#itemListPage", function () { + $(document).on('pageinitdepends', "#itemListPage", function () { var page = this; @@ -250,7 +250,7 @@ $(page).on('click', '.mediaItem', onListItemClick); - }).on('pageshow', "#itemListPage", function () { + }).on('pageshown', "#itemListPage", function () { var page = this; diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 4904a6881b..7ea79936e0 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -535,7 +535,7 @@ html += '
'; html += '
'; - html += '
'; + html += '
'; html += '
'; html += '
'; @@ -594,7 +594,7 @@ var background = 'none'; - if (!AppInfo.hasLowImageBandwidth) { + if (AppInfo.enableDetailsMenuImages) { var backdropUrl; var screenWidth = $(window).width(); var backdropWidth = Math.min(screenWidth, 800); @@ -627,7 +627,7 @@ var headerHtml = LibraryBrowser.getPosterViewDisplayName(item); $('.detailsMenuHeader', elem).removeClass('detailsMenuHeaderWithLogo'); - if (!AppInfo.hasLowImageBandwidth) { + if (AppInfo.enableDetailsMenuImages) { var logoUrl; diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 178673bd0f..d154a2130d 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -406,7 +406,8 @@ var options = { Recursive: true, - IncludeItemTypes: "BoxSet" + IncludeItemTypes: "BoxSet", + SortBy: "SortName" }; ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index 210b8e9820..196d028b7e 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -93,7 +93,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#musicGenresPage", function () { + $(document).on('pageinitdepends', "#musicGenresPage", function () { var page = this; @@ -120,7 +120,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#musicGenresPage", function () { + }).on('pageshown', "#musicGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -136,8 +136,6 @@ reloadItems(this); - }).on('pageshow', "#musicGenresPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index 6b0e924f5e..dc78a8bdfd 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -131,7 +131,7 @@ } } - $(document).on('pageinit', "#musicVideosPage", function () { + $(document).on('pageinitdepends', "#musicVideosPage", function () { var page = this; @@ -189,7 +189,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#musicVideosPage", function () { + }).on('pageshown', "#musicVideosPage", function () { var page = this; @@ -208,8 +208,6 @@ reloadItems(page); - }).on('pageshow', "#musicVideosPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js index 2e0a0f6379..1899fe9fe1 100644 --- a/dashboard-ui/scripts/serversecurity.js +++ b/dashboard-ui/scripts/serversecurity.js @@ -11,7 +11,7 @@ ApiClient.ajax({ type: "DELETE", url: ApiClient.getUrl('Auth/Keys/' + key) - + }).done(function () { loadData(page); @@ -95,7 +95,31 @@ }); } - $(document).on('pageinit', "#serverSecurityPage", function () { + function onSubmit() { + var form = this; + var page = $(form).parents('.page'); + + Dashboard.showLoadingMsg(); + + ApiClient.ajax({ + type: "POST", + url: ApiClient.getUrl('Auth/Keys/', { + + App: $('#txtAppName', form).val() + + }) + + }).done(function () { + + $('.newKeyPanel', page).panel('close'); + + loadData(page); + }); + + return false; + } + + $(document).on('pageinitdepends', "#serverSecurityPage", function () { var page = this; @@ -107,39 +131,13 @@ }); - }).on('pageshow', "#serverSecurityPage", function () { + $('.newKeyForm').off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshown', "#serverSecurityPage", function () { var page = this; loadData(page); }); - window.ServerSecurityPage = { - - onSubmit: function(e) { - - var form = this; - var page = $(form).parents('.page'); - - Dashboard.showLoadingMsg(); - - ApiClient.ajax({ - type: "POST", - url: ApiClient.getUrl('Auth/Keys/', { - - App: $('#txtAppName', form).val() - - }) - - }).done(function () { - - $('.newKeyPanel', page).panel('close'); - - loadData(page); - }); - - return false; - } - }; - })(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 8beaa908ab..70a3141a9f 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -34,7 +34,12 @@ var Dashboard = { //$.mobile.popup.prototype.options.theme = "c"; $.mobile.popup.prototype.options.transition = "fade"; - $.mobile.defaultPageTransition = "none"; + + if ($.browser.mobile) { + $.mobile.defaultPageTransition = "slide"; + } else { + $.mobile.defaultPageTransition = "none"; + } //$.mobile.collapsible.prototype.options.contentTheme = "a"; // Make panels a little larger than the defaults @@ -776,7 +781,7 @@ var Dashboard = { if (item.selected) { menuHtml += ''; } else { - menuHtml += ''; + menuHtml += ''; } menuHtml += ''; @@ -802,7 +807,7 @@ var Dashboard = { html += '
'; - html += '

EMBY

'; + html += '

EMBY

'; html += '
'; html += menuHtml; @@ -1367,10 +1372,18 @@ var Dashboard = { if (AppInfo.hasLowImageBandwidth) { - quality -= 50; + // The native app can handle a little bit more than safari + if (Dashboard.isRunningInCordova()) { - if (isBackdrop) { - //quality -= 20; + quality -= 30; + + if (isBackdrop) { + quality -= 10; + } + + } else { + + quality -= 50; } } @@ -1383,6 +1396,11 @@ var Dashboard = { options.enableImageEnhancers = false; } + + if (AppInfo.forcedImageFormat && options.type != 'Logo') { + options.format = AppInfo.forcedImageFormat; + options.backgroundColor = '#1f1f1f'; + } }, getAppInfo: function () { @@ -1488,14 +1506,19 @@ var AppInfo = {}; if ($.browser.mobile) { AppInfo.hasLowImageBandwidth = true; + AppInfo.enableDetailsMenuImages = false; + AppInfo.forcedImageFormat = 'jpg'; } if (isCordova) { AppInfo.enableBottomTabs = true; + AppInfo.enableDetailsMenuImages = true; } } else { + AppInfo.enableDetailsMenuImages = true; + if (!$.browser.tv) { AppInfo.enableHeadRoom = true; } @@ -1768,7 +1791,8 @@ var AppInfo = {}; '*': { 'css': 'thirdparty/requirecss' // or whatever the path to require-css is } - } + }, + urlArgs: "v=" + window.dashboardVersion }); // Required since jQuery is loaded before requireJs @@ -1783,6 +1807,10 @@ var AppInfo = {}; document.addEventListener("deviceready", function () { + if ($.browser.safari) { + requirejs(['thirdparty/cordova/imagestore.js']); + } + $(onReady); }, false); @@ -1841,6 +1869,8 @@ $(document).on('pagecreate', ".page", function () { $(page).trigger('pageinitdepends'); } + $('.localnav a, .libraryViewNav a').attr('data-transition', 'none'); + }).on('pageshow', ".page", function () { var page = this; diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index 4a7992843e..a36f19466b 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -133,7 +133,7 @@ $('#selectView', page).val(view).selectmenu('refresh'); } - $(document).on('pageinit', "#tvGenresPage", function () { + $(document).on('pageinitdepends', "#tvGenresPage", function () { var page = this; @@ -178,7 +178,7 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); - }).on('pagebeforeshow', "#tvGenresPage", function () { + }).on('pageshown', "#tvGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); var page = this; @@ -203,8 +203,6 @@ } }); - }).on('pageshow', "#tvGenresPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index 44cfbee2c9..c26a242f1a 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -95,7 +95,7 @@ $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); } - $(document).on('pageinit', "#tvPeoplePage", function () { + $(document).on('pageinitdepends', "#tvPeoplePage", function () { var page = this; @@ -147,7 +147,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#tvPeoplePage", function () { + }).on('pageshown', "#tvPeoplePage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -163,8 +163,6 @@ reloadItems(this); - }).on('pageshow', "#tvPeoplePage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index 2e457a31ca..d252ff76af 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -81,7 +81,7 @@ $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } - $(document).on('pageinit', "#tvStudiosPage", function () { + $(document).on('pageinitdepends', "#tvStudiosPage", function () { var page = this; @@ -108,7 +108,7 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#tvStudiosPage", function () { + }).on('pageshown', "#tvStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -124,8 +124,6 @@ reloadItems(this); - }).on('pageshow', "#tvStudiosPage", function () { - updateFilterControls(this); }); diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index 1ff08fa913..fd53a129f1 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -1,6 +1,6 @@ (function ($, document) { - $(document).on('pagebeforeshow', "#tvUpcomingPage", function () { + $(document).on('pageshown', "#tvUpcomingPage", function () { var page = this; diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html index 60a949b313..a9ad4049f1 100644 --- a/dashboard-ui/serversecurity.html +++ b/dashboard-ui/serversecurity.html @@ -4,7 +4,7 @@ ${TitleAdvanced} -
+
@@ -55,10 +55,6 @@

- -
diff --git a/dashboard-ui/thirdparty/cordova/imagestore.js b/dashboard-ui/thirdparty/cordova/imagestore.js new file mode 100644 index 0000000000..3b02ef95bb --- /dev/null +++ b/dashboard-ui/thirdparty/cordova/imagestore.js @@ -0,0 +1,185 @@ +(function () { + + function setImageIntoElement(elem, url) { + + if (elem.tagName === "DIV") { + + elem.style.backgroundImage = "url('" + url + "')"; + + } else { + elem.setAttribute("src", url); + } + } + + function onDbOpened(imageStore, db) { + + imageStore._db = db; + window.ImageStore = imageStore; + } + + function openDb(imageStore) { + + // Create/open database + var db = window.sqlitePlugin.openDatabase({ name: "my.db" }); + + db.transaction(function (tx) { + + tx.executeSql('CREATE TABLE IF NOT EXISTS images (id text primary key, data text)'); + tx.executeSql('create index if not exists idx_images on images(id)'); + + onDbOpened(imageStore, db); + }); + } + + function sqliteImageStore() { + + var self = this; + + self.addImageToDatabase = function (blob, key) { + + var deferred = DeferredBuilder.Deferred(); + + console.log("addImageToDatabase"); + + self.db().transaction(function (tx) { + + tx.executeSql("INSERT INTO images (id, data) VALUES (?,?)", [key, blob], function (tx, res) { + + deferred.resolve(); + }, function (e) { + deferred.reject(); + }); + }); + + return deferred.promise(); + }; + + self.db = function () { + + return self._db; + }; + + self.get = function (key) { + + var deferred = DeferredBuilder.Deferred(); + + self.db().transaction(function (tx) { + + tx.executeSql("SELECT data from images where id=?", [key], function (tx, res) { + + if (res.rows.length) { + + deferred.resolveWith(null, [res.rows.item(0).data]); + } else { + deferred.reject(); + } + }, function (e) { + deferred.reject(); + }); + }); + + return deferred.promise(); + }; + + self.getImageUrl = function (originalUrl) { + + console.log('getImageUrl:' + originalUrl); + + var key = CryptoJS.SHA1(originalUrl).toString(); + + var deferred = DeferredBuilder.Deferred(); + + self.get(key).done(function (url) { + + deferred.resolveWith(null, [url]); + + }).fail(function () { + + self.downloadImage(originalUrl, key).done(function () { + self.get(key).done(function (url) { + + deferred.resolveWith(null, [url]); + + }).fail(function () { + + deferred.reject(); + }); + }).fail(function () { + + deferred.reject(); + }); + }); + + return deferred.promise(); + }; + + self.downloadImage = function (url, key) { + + var deferred = DeferredBuilder.Deferred(); + + console.log('downloadImage:' + url); + + // Create XHR + var xhr = new XMLHttpRequest(); + + xhr.open("GET", url, true); + // Set the responseType to blob + xhr.responseType = "arraybuffer"; + + xhr.addEventListener("load", function () { + + if (xhr.status === 200) { + console.log("Image retrieved"); + + try { + + var arr = new Uint8Array(this.response); + + // Convert the int array to a binary string + // We have to use apply() as we are converting an *array* + // and String.fromCharCode() takes one or more single values, not + // an array. + var raw = String.fromCharCode.apply(null, arr); + + // This works!!! + var b64 = btoa(raw); + var dataURL = "data:image/jpeg;base64," + b64; + + // Put the received blob into the database + self.addImageToDatabase(dataURL, key).done(function () { + deferred.resolve(); + }).fail(function () { + deferred.reject(); + }); + } catch (err) { + console.log("Error adding image to database"); + deferred.reject(); + } + } else { + deferred.reject(); + } + }, false); + + // Send XHR + xhr.send(); + return deferred.promise(); + }; + + self.setImageInto = function (elem, url) { + + function onFail() { + setImageIntoElement(elem, url); + } + + self.getImageUrl(url).done(function (localUrl) { + setImageIntoElement(elem, localUrl); + + }).fail(onFail); + }; + + openDb(self); + } + + new sqliteImageStore(); + +})(); diff --git a/dashboard-ui/thirdparty/cordova/serverdiscovery.js b/dashboard-ui/thirdparty/cordova/serverdiscovery.js index d5aa72f9f7..01d4f73f53 100644 --- a/dashboard-ui/thirdparty/cordova/serverdiscovery.js +++ b/dashboard-ui/thirdparty/cordova/serverdiscovery.js @@ -85,12 +85,19 @@ chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', port, function (result) { + if (result != 0) { + console.log('bind fail: ' + result); + deferred.resolveWith(null, [servers]); + chrome.sockets.udp.close(createInfo.socketId); + return; + } + var data = stringToArrayBuffer('who is EmbyServer?'); console.log('chrome.sockets.udp.send'); chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) { - if (result < 0) { + if (result != 0) { console.log('send fail: ' + result); deferred.resolveWith(null, [servers]); chrome.sockets.udp.close(createInfo.socketId); diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js index 78d46042f6..7059dc3806 100644 --- a/dashboard-ui/thirdparty/jquery.unveil-custom.js +++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js @@ -94,19 +94,6 @@ (function () { - // IndexedDB - var indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.OIndexedDB || window.msIndexedDB, - dbVersion = 1.0; - - var dbName = "emby4"; - var imagesStoreName = "images"; - - function createObjectStore(dataBase) { - // Create an objectStore - console.log("Creating objectStore"); - dataBase.createObjectStore(imagesStoreName); - } - function setImageIntoElement(elem, url) { if (elem.tagName === "DIV") { @@ -118,345 +105,6 @@ } } - function openDb() { - - var deferred = $.Deferred(); - - // Create/open database - var request = indexedDB.open(dbName, dbVersion); - - request.onerror = function (event) { - - console.log("Error creating/accessing IndexedDB database"); - deferred.reject(); - }; - - request.onsuccess = function (event) { - console.log("Success creating/accessing IndexedDB database"); - - var db = request.result || event.target.result; - - db.onerror = function (event) { - console.log("Error creating/accessing IndexedDB database"); - }; - - // Interim solution for Google Chrome to create an objectStore. Will be deprecated - if (db.setVersion) { - if (db.version != dbVersion) { - var setVersion = db.setVersion(dbVersion); - setVersion.onsuccess = function () { - createObjectStore(db); - deferred.resolveWith(null, [db]); - }; - } else { - deferred.resolveWith(null, [db]); - } - } else { - deferred.resolveWith(null, [db]); - } - } - - // For future use. Currently only in latest Firefox versions - request.onupgradeneeded = function (event) { - createObjectStore(event.target.result); - }; - - return deferred.promise(); - } - - function indexedDbImageStore() { - - var self = this; - - openDb().done(function (db) { - - self._db = db; - window.ImageStore = self; - }); - - self.addImageToDatabase = function (blob, key) { - - console.log("addImageToDatabase"); - - // Open a transaction to the database - var transaction = self.db().transaction([imagesStoreName], "readwrite"); - - // Put the blob into the dabase - var put = transaction.objectStore(imagesStoreName).put(blob, key); - }; - - self.db = function () { - - return self._db; - }; - - self.get = function (key) { - - var deferred = DeferredBuilder.Deferred(); - - var transaction = self.db().transaction([imagesStoreName], "readonly"); - - // Open a transaction to the database - var getRequest = transaction.objectStore(imagesStoreName).get(key); - - getRequest.onsuccess = function (event) { - - var imgFile = event.target.result; - - if (imgFile) { - deferred.resolveWith(null, [imgFile]); - } else { - deferred.reject(); - } - }; - - getRequest.onerror = function () { - deferred.reject(); - }; - - return deferred.promise(); - }; - - self.getImageUrl = function (originalUrl) { - - console.log('getImageUrl:' + originalUrl); - - var key = CryptoJS.SHA1(originalUrl).toString(); - - var deferred = DeferredBuilder.Deferred(); - - self.get(key).done(function (url) { - - deferred.resolveWith(null, [url]); - - }).fail(function () { - - self.downloadImage(originalUrl, key).done(function () { - self.get(key).done(function (url) { - - deferred.resolveWith(null, [url]); - - }).fail(function () { - - deferred.reject(); - }); - }).fail(function () { - - deferred.reject(); - }); - }); - - return deferred.promise(); - }; - - self.downloadImage = function (url, key) { - - var deferred = DeferredBuilder.Deferred(); - - console.log('downloadImage:' + url); - - // Create XHR - var xhr = new XMLHttpRequest(); - - xhr.open("GET", url, true); - // Set the responseType to blob - xhr.responseType = "arraybuffer"; - - xhr.addEventListener("load", function () { - - if (xhr.status === 200) { - console.log("Image retrieved"); - - try { - - var arr = new Uint8Array(this.response); - - // Convert the int array to a binary string - // We have to use apply() as we are converting an *array* - // and String.fromCharCode() takes one or more single values, not - // an array. - var raw = String.fromCharCode.apply(null, arr); - - // This works!!! - var b64 = btoa(raw); - var dataURL = "data:image/jpeg;base64," + b64; - - // Put the received blob into IndexedDB - self.addImageToDatabase(dataURL, key); - deferred.resolve(); - } catch (err) { - console.log("Error adding image to database"); - deferred.reject(); - } - } else { - deferred.reject(); - } - }, false); - - // Send XHR - xhr.send(); - return deferred.promise(); - }; - - self.setImageInto = function (elem, url) { - - function onFail() { - setImageIntoElement(elem, url); - } - - self.getImageUrl(url).done(function (localUrl) { - - setImageIntoElement(elem, localUrl); - - }).fail(onFail); - }; - } - - function indexedDbBlobImageStore() { - - var self = this; - - openDb().done(function (db) { - - self._db = db; - window.ImageStore = self; - }); - - self.addImageToDatabase = function (blob, key) { - - console.log("addImageToDatabase"); - - // Open a transaction to the database - var transaction = self.db().transaction([imagesStoreName], "readwrite"); - - // Put the blob into the dabase - var put = transaction.objectStore(imagesStoreName).put(blob, key); - }; - - self.db = function () { - - return self._db; - }; - - self.get = function (key) { - - var deferred = DeferredBuilder.Deferred(); - - var transaction = self.db().transaction([imagesStoreName], "readonly"); - - // Open a transaction to the database - var getRequest = transaction.objectStore(imagesStoreName).get(key); - - getRequest.onsuccess = function (event) { - - var imgFile = event.target.result; - - if (imgFile) { - - // Get window.URL object - var URL = window.URL || window.webkitURL; - - // Create and revoke ObjectURL - var imgUrl = URL.createObjectURL(imgFile); - - deferred.resolveWith(null, [imgUrl]); - } else { - deferred.reject(); - } - }; - - getRequest.onerror = function () { - deferred.reject(); - }; - - return deferred.promise(); - }; - - self.getImageUrl = function (originalUrl) { - - console.log('getImageUrl:' + originalUrl); - - var key = CryptoJS.SHA1(originalUrl + "1").toString(); - - var deferred = DeferredBuilder.Deferred(); - - self.get(key).done(function (url) { - - deferred.resolveWith(null, [url]); - - }).fail(function () { - - self.downloadImage(originalUrl, key).done(function () { - self.get(key).done(function (url) { - - deferred.resolveWith(null, [url]); - - }).fail(function () { - - deferred.reject(); - }); - }).fail(function () { - - deferred.reject(); - }); - }); - - return deferred.promise(); - }; - - self.downloadImage = function (url, key) { - - var deferred = DeferredBuilder.Deferred(); - - console.log('downloadImage:' + url); - - // Create XHR - var xhr = new XMLHttpRequest(); - - xhr.open("GET", url, true); - // Set the responseType to blob - xhr.responseType = "arraybuffer"; - - xhr.addEventListener("load", function () { - - if (xhr.status === 200) { - console.log("Image retrieved"); - - try { - var blob = new Blob([this.response], { type: this.getResponseHeader('content-type') }); - - // Put the received blob into IndexedDB - self.addImageToDatabase(blob, key); - deferred.resolve(); - } catch (err) { - console.log("Error adding blob to database"); - alert("Error adding blob to database"); - deferred.reject(); - } - } else { - deferred.reject(); - } - }, false); - - // Send XHR - xhr.send(); - return deferred.promise(); - }; - - self.setImageInto = function (elem, url) { - - function onFail() { - setImageIntoElement(elem, url); - } - - self.getImageUrl(url).done(function (localUrl) { - - setImageIntoElement(elem, localUrl); - - }).fail(onFail); - }; - } - function simpleImageStore() { var self = this; @@ -467,13 +115,4 @@ console.log('creating simpleImageStore'); window.ImageStore = new simpleImageStore(); - //if ($.browser.safari && indexedDB && window.Blob) { - // console.log('creating indexedDbBlobImageStore'); - // new indexedDbBlobImageStore(); - //} - //else if ($.browser.safari && indexedDB) { - // console.log('creating indexedDbImageStore'); - // new indexedDbImageStore(); - //} - })(); \ No newline at end of file diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index 43a05f7127..c654d416be 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabLatest} diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html index 3af811e360..8f6553a843 100644 --- a/dashboard-ui/tvpeople.html +++ b/dashboard-ui/tvpeople.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabLatest} diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index e192c1d7a0..0cb44c19d6 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -26,20 +26,17 @@
-
-