diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 0727dad58c..2c19c85239 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -1,16 +1,6 @@ (function ($, document, LibraryBrowser, window) { var currentItem; - var sessionsPromise; - - function getSessionsPromise() { - - if (sessionsPromise == null) { - sessionsPromise = ApiClient.getSessions(); - } - - return sessionsPromise; - } function reload(page) { @@ -874,6 +864,11 @@ Dashboard.navigate("edititemmetadata.html?id=" + currentItem.Id); }); + $('#btnRemote', page).on('click', function () { + + RemoteControl.showMenu(page, currentItem); + }); + }).on('pageshow', "#itemDetailPage", function () { var page = this; diff --git a/dashboard-ui/scripts/alphapicker.js b/dashboard-ui/scripts/alphapicker.js new file mode 100644 index 0000000000..627292d68e --- /dev/null +++ b/dashboard-ui/scripts/alphapicker.js @@ -0,0 +1,93 @@ +(function (window, document, $) { + + function getPickerHtml() { + + var html = ''; + + html += '#'; + html += 'A'; + html += 'B'; + html += 'C'; + html += 'D'; + html += 'E'; + html += 'F'; + html += 'G'; + html += 'H'; + html += 'I'; + html += 'J'; + html += 'K'; + html += 'L'; + html += 'M'; + html += 'N'; + html += 'O'; + html += 'P'; + html += 'Q'; + html += 'R'; + html += 'S'; + html += 'T'; + html += 'U'; + html += 'V'; + html += 'W'; + html += 'X'; + html += 'Y'; + html += 'Z'; + + return html; + } + + $(document).on('pageinit', ".libraryPage", function () { + + var page = this; + + var picker = $('.alphabetPicker', page); + + if (!picker.length) { + return; + } + + $('.itemsContainer', page).addClass('itemsContainerWithAlphaPicker'); + + picker.html(getPickerHtml()).trigger('create').on('click', 'a', function () { + + var elem = $(this); + + var isSelected = elem.hasClass('selectedCharacter'); + + $('.selectedCharacter', picker).removeClass('selectedCharacter'); + + if (!isSelected) { + + elem.addClass('selectedCharacter'); + picker.trigger('alphaselect', [this.innerHTML]); + } else { + picker.trigger('alphaclear'); + } + }); + }); + + $.fn.alphaValue = function (val) { + + if (val == null) { + return $('.selectedCharacter', this).html(); + } + + val = val.toLowerCase(); + + $('.selectedCharacter', this).removeClass('selectedCharacter'); + + $('a', this).each(function () { + + if (this.innerHTML.toLowerCase() == val) { + + $(this).addClass('selectedCharacter'); + + } else { + $(this).removeClass('selectedCharacter'); + } + + }); + + return this; + }; + +})(window, document, jQuery); \ No newline at end of file diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 11332bb5e9..7cb6d0c6ca 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1745,96 +1745,3 @@ })(window, document, jQuery); -(function (window, document, $) { - - function getPickerHtml() { - - var html = ''; - - html += '#'; - html += 'A'; - html += 'B'; - html += 'C'; - html += 'D'; - html += 'E'; - html += 'F'; - html += 'G'; - html += 'H'; - html += 'I'; - html += 'J'; - html += 'K'; - html += 'L'; - html += 'M'; - html += 'N'; - html += 'O'; - html += 'P'; - html += 'Q'; - html += 'R'; - html += 'S'; - html += 'T'; - html += 'U'; - html += 'V'; - html += 'W'; - html += 'X'; - html += 'Y'; - html += 'Z'; - - return html; - } - - $(document).on('pageinit', ".libraryPage", function () { - - var page = this; - - var picker = $('.alphabetPicker', page); - - if (!picker.length) { - return; - } - - $('.itemsContainer', page).addClass('itemsContainerWithAlphaPicker'); - - picker.html(getPickerHtml()).trigger('create').on('click', 'a', function () { - - var elem = $(this); - - var isSelected = elem.hasClass('selectedCharacter'); - - $('.selectedCharacter', picker).removeClass('selectedCharacter'); - - if (!isSelected) { - - elem.addClass('selectedCharacter'); - picker.trigger('alphaselect', [this.innerHTML]); - } else { - picker.trigger('alphaclear'); - } - }); - }); - - $.fn.alphaValue = function (val) { - - if (val == null) { - return $('.selectedCharacter', this).html(); - } - - val = val.toLowerCase(); - - $('.selectedCharacter', this).removeClass('selectedCharacter'); - - $('a', this).each(function () { - - if (this.innerHTML.toLowerCase() == val) { - - $(this).addClass('selectedCharacter'); - - } else { - $(this).removeClass('selectedCharacter'); - } - - }); - - return this; - }; - -})(window, document, jQuery); \ No newline at end of file diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index c1e9cfbc5f..4fcf09f81d 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -492,6 +492,13 @@ level: 3 })); + var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, { + videoCodec: 'h264', + audioCodec: 'aac', + profile: 'baseline', + level: 3 + })); + var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, { videoCodec: 'vpx', audioCodec: 'Vorbis' @@ -517,6 +524,7 @@ } html += ''; + html += ''; html += ''; html += ''; html += 'Ok'; + html += '

'; + + html += ''; + + html += ''; + + $(document.body).append(html); + + $('#remoteControlFlyout').popup({ history: false }).trigger('create').popup("open").on("popupafterclose", function () { + + $(this).off("popupafterclose").remove(); + }); + }; + } + + window.RemoteControl = new remoteControl(); + +})(window, document, jQuery); \ No newline at end of file