diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index 517291c306..eaa0592bc0 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -90,7 +90,7 @@

- ${ButtonCancel} + ${ButtonCancel} diff --git a/dashboard-ui/homefavorites.html b/dashboard-ui/homefavorites.html new file mode 100644 index 0000000000..ddc192b733 --- /dev/null +++ b/dashboard-ui/homefavorites.html @@ -0,0 +1,24 @@ + + + + Emby + + +
+ +
+ home${TabHome} + navigate_next${TabNextUp} + favorite${TabFavorites} + schedule${TabUpcoming} +
+ +
+ +
+
+
+
+
+ + diff --git a/dashboard-ui/homenextup.html b/dashboard-ui/homenextup.html new file mode 100644 index 0000000000..10b2b3b9e4 --- /dev/null +++ b/dashboard-ui/homenextup.html @@ -0,0 +1,41 @@ + + + + Emby + + +
+ +
+ home${TabHome} + navigate_next${TabNextUp} + favorite${TabFavorites} + schedule${TabUpcoming} +
+
+
+ + + +
+
+

${HeaderNextUp}

+ ${ButtonSync} +
+
+
+
+ +
+
+
+ + diff --git a/dashboard-ui/homeupcoming.html b/dashboard-ui/homeupcoming.html new file mode 100644 index 0000000000..1472c45d5a --- /dev/null +++ b/dashboard-ui/homeupcoming.html @@ -0,0 +1,26 @@ + + + + Emby + + +
+
+ home${TabHome} + navigate_next${TabNextUp} + favorite${TabFavorites} + schedule${TabUpcoming} +
+
+
+
+
+ +
+
+
+ + diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index 982b2e92f0..913d1e3181 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -9,9 +9,9 @@
home${TabHome} - navigate_next${TabNextUp} - favorite${TabFavorites} - schedule${TabUpcoming} + navigate_next${TabNextUp} + favorite${TabFavorites} + schedule${TabUpcoming}
@@ -29,72 +29,5 @@
-
- -
- home${TabHome} - navigate_next${TabNextUp} - favorite${TabFavorites} - schedule${TabUpcoming} -
-
-
- - - -
-
-

${HeaderNextUp}

- ${ButtonSync} -
-
-
-
- -
-
-
-
- -
- home${TabHome} - navigate_next${TabNextUp} - favorite${TabFavorites} - schedule${TabUpcoming} -
- -
- -
-
-
-
-
-
-
- home${TabHome} - navigate_next${TabNextUp} - favorite${TabFavorites} - schedule${TabUpcoming} -
-
-
-
-
- -
-
-
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index a848fa03e3..4cedc30932 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -9,9 +9,9 @@ diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index 23b50b52ee..61dd36bbbf 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html new file mode 100644 index 0000000000..8665852bfa --- /dev/null +++ b/dashboard-ui/livetvchannels.html @@ -0,0 +1,60 @@ + + + + Emby + + +
+
+ info${TabSuggestions} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries} +
+
+
+
+
+
+
+ +
+ +
+
+ +
+ ${TabView} + ${TabFilter} +
+ +
+ +
+ + +
+ +
+
+
+ ${HeaderFilters} + + + + + + + + +
+ +
+ +
+ +
+ + diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html new file mode 100644 index 0000000000..f6f897193a --- /dev/null +++ b/dashboard-ui/livetvguide.html @@ -0,0 +1,42 @@ + + + + Emby + + +
+
+ info${TabSuggestions} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries} +
+
+ +
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html index bdf3112204..4f59d59026 100644 --- a/dashboard-ui/livetvitems.html +++ b/dashboard-ui/livetvitems.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index ea346655aa..5721965ede 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html index 25f7e2542f..c519ac0edf 100644 --- a/dashboard-ui/livetvprogram.html +++ b/dashboard-ui/livetvprogram.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index 441b17dda2..e86e90a65d 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html index b8978ed35c..24ba446b4d 100644 --- a/dashboard-ui/livetvrecordinglist.html +++ b/dashboard-ui/livetvrecordinglist.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html new file mode 100644 index 0000000000..e65b502a9b --- /dev/null +++ b/dashboard-ui/livetvrecordings.html @@ -0,0 +1,40 @@ + + + + Emby + + +
+ +
+ info${TabSuggestions} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries} +
+
+
+ + + +
+
+
+ + diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index 3862785841..4c76736f63 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html new file mode 100644 index 0000000000..19cf7b3cae --- /dev/null +++ b/dashboard-ui/livetvseriestimers.html @@ -0,0 +1,57 @@ + + + + Emby + + +
+
+ info${TabSuggestions} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries} +
+
+
+ +
+ +
+ +
+
+
+
+ + +
+ + ${HeaderSortBy} + + + + + + + +
+ +
+ + ${HeaderSortOrder} + + + + + + + +
+ +
+ +
+ + diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html index a47c72d164..3c674895c7 100644 --- a/dashboard-ui/livetvsuggested.html +++ b/dashboard-ui/livetvsuggested.html @@ -8,11 +8,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
@@ -45,187 +45,5 @@
-
-
- info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} -
-
- -
-
-
-
- -
-
-
-
- -
- -
-
-
-
-
- -
-
-
-
- info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} -
-
-
-
-
-
-
- -
- -
-
- -
- ${TabView} - ${TabFilter} -
- -
- -
- - -
- -
-
-
- ${HeaderFilters} - - - - - - - - -
- -
- -
- -
-
- -
- info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} -
-
-
- - - -
-
-
-
-
- info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} -
-
-
-
-
-
-
-
-
- info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} -
-
-
- -
- -
- -
-
-
-
- -
-
- - ${HeaderSortBy} - - - - - - - -
- -
- - ${HeaderSortOrder} - - - - - - - -
- -
- -
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index 257a134201..bd17992b64 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -7,11 +7,11 @@
info${TabSuggestions} - grid_on${TabGuide} - live_tv${TabChannels} - slideshow${TabRecordings} - schedule${TabScheduled} - refresh${TabSeries} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries}
@@ -74,7 +74,7 @@ - diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html new file mode 100644 index 0000000000..44051f32c4 --- /dev/null +++ b/dashboard-ui/livetvtimers.html @@ -0,0 +1,23 @@ + + + + Emby + + +
+
+ info${TabSuggestions} + grid_on${TabGuide} + live_tv${TabChannels} + slideshow${TabRecordings} + schedule${TabScheduled} + refresh${TabSeries} +
+
+
+
+
+
+
+ + diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js index eda1ca9c0b..3307ecdd2e 100644 --- a/dashboard-ui/scripts/addpluginpage.js +++ b/dashboard-ui/scripts/addpluginpage.js @@ -93,7 +93,7 @@ html += "
"; } - $('#latestReviews', page).html(html).trigger('create'); + Events.trigger($('#latestReviews', page).html(html)[0], 'create'); }); } diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index 7a62f9dee5..99074b1e7d 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -152,7 +152,7 @@ } else if (message.type && message.type.indexOf('playback') == 0) { - $(this).trigger(message.type, [message.data]); + Events.trigger(this, message.type, [message.data]); } }; @@ -225,7 +225,7 @@ this.session.addMediaListener(this.sessionMediaListener.bind(this)); this.session.addUpdateListener(this.sessionUpdateListener.bind(this)); - $(this).trigger('connect'); + Events.trigger(this, 'connect'); this.sendMessage({ options: {}, @@ -480,7 +480,7 @@ castPlayer.initializeCastPlayer(); var state = self.getPlayerStateInternal(data); - $(self).trigger("playbackstart", [state]); + Events.trigger(self, "playbackstart", [state]); }); $(castPlayer).on("playbackstop", function (e, data) { @@ -488,7 +488,7 @@ Logger.log('cc: playbackstop'); var state = self.getPlayerStateInternal(data); - $(self).trigger("playbackstop", [state]); + Events.trigger(self, "playbackstop", [state]); // Reset this so the next query doesn't make it appear like content is playing. self.lastPlayerData = {}; @@ -499,7 +499,7 @@ Logger.log('cc: positionchange'); var state = self.getPlayerStateInternal(data); - $(self).trigger("positionchange", [state]); + Events.trigger(self, "positionchange", [state]); }); self.play = function (options) { diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 5398b4abc8..54d954f7e1 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -1440,7 +1440,7 @@ //$.mobile.urlHistory.ignoreNextHashChange = true; window.location.hash = 'editItemMetadataPage?id=' + data.id; - + alert(window.location.href); reload(page); } }); diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index da132a9ee1..cf41cff6ea 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -85,7 +85,7 @@ ImageLoader.lazyChildren(elem); if (trigger) { - $(elem).trigger('create'); + Events.trigger(elem, 'create'); } $('.btnNextPage', page).on('click', function () { @@ -356,7 +356,7 @@ LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) { if (val) { - $('#selectView', page).val(val).selectmenu('refresh').trigger('change'); + Events.trigger($('#selectView', page).val(val).selectmenu('refresh')[0], 'change'); } else { reloadItems(page); } diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index 01ec20646e..aa3d0e10e8 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -54,7 +54,7 @@ html += '
'; if (result.TotalRecordCount > result.Items.length) { - var href = "index.html#favoritesPage?sectionid=" + section.id; + var href = "homefavorites.html?sectionid=" + section.id; html += '' + Globalize.translate('ButtonMoreItems') + ''; } diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index e4a1bda78c..7d1e88b1c1 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -33,7 +33,7 @@ totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + })); updateFilterControls(page); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 3dbe33ad12..7f91c62bd4 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -545,7 +545,7 @@ var id = item.Id || item.ItemId; if (item.CollectionType == 'livetv') { - return 'livetvsuggested.html#liveTvSuggestedPage'; + return 'livetvsuggested.html'; } if (item.CollectionType == 'channels') { diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js index 8ede6a9b06..d9379c3b38 100644 --- a/dashboard-ui/scripts/livetvnewrecording.js +++ b/dashboard-ui/scripts/livetvnewrecording.js @@ -126,7 +126,7 @@ ApiClient.createLiveTvSeriesTimer(item).done(function () { Dashboard.hideLoadingMsg(); - Dashboard.navigate('livetvsuggested.html#liveTvSeriesTimersPage'); + Dashboard.navigate('livetvseriestimers.html'); }); @@ -134,7 +134,7 @@ ApiClient.createLiveTvTimer(item).done(function () { Dashboard.hideLoadingMsg(); - Dashboard.navigate('livetvsuggested.html#liveTvTimersPage'); + Dashboard.navigate('livetvtimers.html'); }); } diff --git a/dashboard-ui/scripts/livetvrecording.js b/dashboard-ui/scripts/livetvrecording.js index 71ef931b75..6fe239556e 100644 --- a/dashboard-ui/scripts/livetvrecording.js +++ b/dashboard-ui/scripts/livetvrecording.js @@ -14,7 +14,7 @@ Dashboard.alert(Globalize.translate('MessageRecordingDeleted')); - Dashboard.navigate('livetvsuggested.html#liveTvRecordingsPage'); + Dashboard.navigate('livetvrecordings.html'); }); } diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 6d42a9e7f1..993af28389 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -14,7 +14,7 @@ Dashboard.alert(Globalize.translate('MessageRecordingCancelled')); - Dashboard.navigate('livetvsuggested.html#liveTvTimersPage'); + Dashboard.navigate('livetvtimers.html'); }); } diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index 33f6a59e68..09cf7901db 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -43,7 +43,7 @@ html += ''; - $('.serverLogs', page).html(html).trigger('create'); + Events.trigger($('.serverLogs', page).html(html)[0], 'create'); }); }); diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index fd5f67d25b..10c0c34c90 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -94,7 +94,7 @@ var itemsContainer = elem.querySelector('.itemsContainer'); itemsContainer.innerHTML = html; - ImageLoader.lazyChildren(html); + ImageLoader.lazyChildren(itemsContainer); } function requestSearchHintsForOverlay(elem, searchTerm) { @@ -134,17 +134,16 @@ function getSearchOverlay(createIfNeeded) { - var elem = $('.searchResultsOverlay'); + var elem = document.querySelector('.searchResultsOverlay'); - if (createIfNeeded && !elem.length) { + if (createIfNeeded && !elem) { var html = '
'; html += '
'; - elem = $(html).appendTo(document.body).hide().trigger('create'); - - elem.createCardMenus(); + elem = $(html).appendTo(document.body).hide()[0]; + $(elem).createCardMenus(); } return elem; @@ -152,14 +151,29 @@ function onHeaderSearchChange(val) { + var elem; + if (val) { - updateSearchOverlay(getSearchOverlay(true).fadeIn('fast'), val); + + elem = getSearchOverlay(true); + + $(elem).show(); + elem.style.opacity = '1'; document.body.classList.add('bodyWithPopupOpen'); - } else { + updateSearchOverlay(elem, val); - updateSearchOverlay(getSearchOverlay(false).fadeOut('fast'), val); - document.body.classList.remove('bodyWithPopupOpen'); + } else { + elem = getSearchOverlay(false); + + if (elem) { + require(["jquery", "velocity"], function ($, Velocity) { + + $(elem).velocity("fadeOut"); + document.body.classList.remove('bodyWithPopupOpen'); + }); + updateSearchOverlay(elem, ''); + } } } diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 7e97ca9f09..1c722035dc 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -440,7 +440,7 @@ html += '
'; html += '

' + Globalize.translate('HeaderLatestTvRecordings') + '

'; - html += '' + Globalize.translate('ButtonMore') + ''; + html += '' + Globalize.translate('ButtonMore') + ''; html += '
'; } diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 18068d0778..dfac31ea9b 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -72,7 +72,7 @@ elem.innerHTML = html + pagingHtml; ImageLoader.lazyChildren(elem); - $(elem).trigger('create'); + Events.trigger(elem, 'create'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 611338f973..f5c46d8af0 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -116,7 +116,7 @@ ImageLoader.lazyChildren(elem); if (trigger) { - $(elem).trigger('create'); + Events.trigger(elem, 'create'); } $('.btnNextPage', page).on('click', function () { @@ -381,7 +381,7 @@ LibraryBrowser.getSavedViewSetting(viewKey).done(function (val) { if (val) { - $('#selectView', page).val(val).selectmenu('refresh').trigger('change'); + Events.trigger($('#selectView', page).val(val).selectmenu('refresh')[0], 'change'); } else { reloadItems(page); } diff --git a/dashboard-ui/voice/voice.js b/dashboard-ui/voice/voice.js index 0b63930d6f..e51464a099 100644 --- a/dashboard-ui/voice/voice.js +++ b/dashboard-ui/voice/voice.js @@ -248,12 +248,12 @@ function showCommand(result) { if (result.category == 'tvguide') { - Dashboard.navigate('livetvsuggested.html#liveTvGuidePage'); + Dashboard.navigate('livetvguide.html'); return; } if (result.category == 'recordings') { - Dashboard.navigate('livetvsuggested.html#liveTvRecordingsPage'); + Dashboard.navigate('livetvrecordings.html'); return; } }