From f5323ff3c26e9488189d7e68821f087d6d641d15 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 19 Aug 2015 00:08:03 -0400 Subject: [PATCH] update detail screens --- .../iron-a11y-keys-behavior/.bower.json | 6 +- .../iron-dropdown/.bower.json | 8 +- .../bower_components/iron-dropdown/bower.json | 2 +- .../iron-dropdown/demo/index.html | 6 +- .../iron-dropdown/iron-dropdown.html | 88 ++- .../iron-dropdown/test/iron-dropdown.html | 46 +- .../iron-flex-layout/.bower.json | 6 +- .../iron-overlay-behavior/.bower.json | 6 +- .../neon-animation/.bower.json | 4 +- .../paper-dropdown-menu/.bower.json | 11 +- .../paper-dropdown-menu/bower.json | 2 +- .../paper-dropdown-menu/demo/index.html | 15 + .../paper-dropdown-menu.html | 34 +- .../test/paper-dropdown-menu.html | 22 + .../paper-menu-button/.bower.json | 8 +- .../paper-menu-button/bower.json | 2 +- .../paper-menu-button/demo/index.html | 2 +- .../paper-menu-button/paper-menu-button.html | 41 +- .../bower_components/paper-styles/.bower.json | 4 +- .../bower_components/polymer/.bower.json | 6 +- dashboard-ui/css/card.css | 1 + dashboard-ui/css/librarybrowser.css | 26 +- dashboard-ui/itembynamedetails.html | 57 -- dashboard-ui/scripts/itembynamedetailpage.js | 697 ++++++------------ dashboard-ui/scripts/itemdetailpage.js | 58 +- dashboard-ui/scripts/librarybrowser.js | 18 +- dashboard-ui/scripts/librarylist.js | 30 +- dashboard-ui/scripts/livetvseriestimers.js | 2 +- dashboard-ui/scripts/livetvtimers.js | 2 +- dashboard-ui/scripts/reports.js | 4 +- dashboard-ui/scripts/secondaryitems.js | 112 ++- dashboard-ui/scripts/site.js | 12 +- dashboard-ui/thirdparty/emby-icons.html | 1 + dashboard-ui/vulcanize-out.html | 1 + 34 files changed, 682 insertions(+), 658 deletions(-) delete mode 100644 dashboard-ui/itembynamedetails.html diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index f0a9c76d51..4072b4af76 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", + "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a" }, - "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-a11y-keys-behavior" + "_originalSource": "PolymerElements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-dropdown/.bower.json b/dashboard-ui/bower_components/iron-dropdown/.bower.json index b277e5a216..a267bed64e 100644 --- a/dashboard-ui/bower_components/iron-dropdown/.bower.json +++ b/dashboard-ui/bower_components/iron-dropdown/.bower.json @@ -1,6 +1,6 @@ { "name": "iron-dropdown", - "version": "1.0.4", + "version": "1.0.5", "description": "", "authors": [ "The Polymer Authors" @@ -35,11 +35,11 @@ "web-component-tester": "*", "iron-image": "polymerelements/iron-image#^1.0.0" }, - "_release": "1.0.4", + "_release": "1.0.5", "_resolution": { "type": "version", - "tag": "v1.0.4", - "commit": "9a09e5ed5a4c6ee9643caba74022a01135c7878b" + "tag": "v1.0.5", + "commit": "9c300a14a5aeca1c02f085e9117521af814ce640" }, "_source": "git://github.com/polymerelements/iron-dropdown.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/iron-dropdown/bower.json b/dashboard-ui/bower_components/iron-dropdown/bower.json index fae691eee6..c80ae15038 100644 --- a/dashboard-ui/bower_components/iron-dropdown/bower.json +++ b/dashboard-ui/bower_components/iron-dropdown/bower.json @@ -1,6 +1,6 @@ { "name": "iron-dropdown", - "version": "1.0.4", + "version": "1.0.5", "description": "", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/iron-dropdown/demo/index.html b/dashboard-ui/bower_components/iron-dropdown/demo/index.html index 2725057c95..2b1e449ac4 100644 --- a/dashboard-ui/bower_components/iron-dropdown/demo/index.html +++ b/dashboard-ui/bower_components/iron-dropdown/demo/index.html @@ -85,7 +85,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
-
    +
      @@ -101,7 +101,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN -
        +
          @@ -109,7 +109,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN -
            +
              diff --git a/dashboard-ui/bower_components/iron-dropdown/iron-dropdown.html b/dashboard-ui/bower_components/iron-dropdown/iron-dropdown.html index 10a1409b0a..b3d4314d41 100644 --- a/dashboard-ui/bower_components/iron-dropdown/iron-dropdown.html +++ b/dashboard-ui/bower_components/iron-dropdown/iron-dropdown.html @@ -145,6 +145,14 @@ method is called on the element. type: Object }, + /** + * If provided, this will be the element that will be focused when + * the dropdown opens. + */ + focusTarget: { + type: Object + }, + /** * Set to true to disable animations when opening and closing the * dropdown. @@ -185,6 +193,17 @@ method is called on the element. return Polymer.dom(this.$.content).getDistributedNodes()[0]; }, + /** + * The element that should be focused when the dropdown opens. + */ + get _focusTarget() { + return this.focusTarget || this.containedElement; + }, + + /** + * The element that should be used to position the dropdown when + * it opens, if no position target is configured. + */ get _defaultPositionTarget() { var parent = Polymer.dom(this).parentNode; @@ -195,6 +214,9 @@ method is called on the element. return parent; }, + /** + * The bounding rect of the position target. + */ get _positionRect() { if (!this._positionRectMemo && this.positionTarget) { this._positionRectMemo = this.positionTarget.getBoundingClientRect(); @@ -203,6 +225,9 @@ method is called on the element. return this._positionRectMemo; }, + /** + * The horizontal offset value used to position the dropdown. + */ get _horizontalAlignTargetValue() { var target; @@ -217,6 +242,9 @@ method is called on the element. return Math.max(target, 0); }, + /** + * The vertical offset value used to position the dropdown. + */ get _verticalAlignTargetValue() { var target; @@ -231,27 +259,41 @@ method is called on the element. return Math.max(target, 0); }, + /** + * Called when the value of `opened` changes. + * + * @param {boolean} opened True if the dropdown is opened. + */ _openedChanged: function(opened) { if (opened && this.disabled) { this.cancel(); } else { - this._cancelAnimations(); + this.cancelAnimation(); this._prepareDropdown(); Polymer.IronOverlayBehaviorImpl._openedChanged.apply(this, arguments); } + + if (this.opened) { + this._focusContent(); + } }, + /** + * Overridden from `IronOverlayBehavior`. + */ _renderOpened: function() { Polymer.IronDropdownScrollManager.pushScrollLock(this); if (!this.noAnimations && this.animationConfig && this.animationConfig.open) { this.$.contentWrapper.classList.add('animating'); this.playAnimation('open'); } else { - this._focusContent(); Polymer.IronOverlayBehaviorImpl._renderOpened.apply(this, arguments); } }, + /** + * Overridden from `IronOverlayBehavior`. + */ _renderClosed: function() { Polymer.IronDropdownScrollManager.removeScrollLock(this); if (!this.noAnimations && this.animationConfig && this.animationConfig.close) { @@ -262,6 +304,12 @@ method is called on the element. } }, + /** + * Called when animation finishes on the dropdown (when opening or + * closing). Responsible for "completing" the process of opening or + * closing the dropdown by positioning it or setting its display to + * none. + */ _onNeonAnimationFinish: function() { this.$.contentWrapper.classList.remove('animating'); if (this.opened) { @@ -271,6 +319,9 @@ method is called on the element. } }, + /** + * Called when an `iron-resize` event fires. + */ _onIronResize: function() { var containedElement = this.containedElement; var scrollTop; @@ -293,14 +344,17 @@ method is called on the element. } }, + /** + * Called when the `positionTarget` property changes. + */ _positionTargetChanged: function() { this._updateOverlayPosition(); }, - _cancelAnimations: function() { - this.cancelAnimation(); - }, - + /** + * Constructs the final animation config from different properties used + * to configure specific parts of the opening and closing animations. + */ _updateAnimationConfig: function() { var animationConfig = {}; var animations = []; @@ -328,12 +382,21 @@ method is called on the element. this.animationConfig = animationConfig; }, + /** + * Prepares the dropdown for opening by updating measured layout + * values. + */ _prepareDropdown: function() { this.sizingTarget = this.containedElement || this.sizingTarget; this._updateAnimationConfig(); this._updateOverlayPosition(); }, + /** + * Updates the overlay position based on configured horizontal + * and vertical alignment, and re-memoizes these values for the sake + * of behavior in `IronFitBehavior`. + */ _updateOverlayPosition: function() { this._positionRectMemo = null; @@ -359,10 +422,17 @@ method is called on the element. } }, + /** + * Focuses the configured focus target. + */ _focusContent: function() { - if (this.containedElement) { - this.containedElement.focus(); - } + // NOTE(cdata): This is async so that it can attempt the focus after + // `display: none` is removed from the element. + this.async(function() { + if (this._focusTarget) { + this._focusTarget.focus(); + } + }); } }); })(); diff --git a/dashboard-ui/bower_components/iron-dropdown/test/iron-dropdown.html b/dashboard-ui/bower_components/iron-dropdown/test/iron-dropdown.html index 9d0ac06a02..6da742f8ff 100644 --- a/dashboard-ui/bower_components/iron-dropdown/test/iron-dropdown.html +++ b/dashboard-ui/bower_components/iron-dropdown/test/iron-dropdown.html @@ -43,6 +43,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN + + + + diff --git a/dashboard-ui/bower_components/paper-menu-button/.bower.json b/dashboard-ui/bower_components/paper-menu-button/.bower.json index ac6859e286..16b4c0a36a 100644 --- a/dashboard-ui/bower_components/paper-menu-button/.bower.json +++ b/dashboard-ui/bower_components/paper-menu-button/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-menu-button", - "version": "1.0.2", + "version": "1.0.3", "description": "", "authors": [ "The Polymer Authors" @@ -41,11 +41,11 @@ "iron-image": "polymerelements/iron-image#^1.0.0", "iron-icon": "polymerelements/iron-icon#^1.0.0" }, - "_release": "1.0.2", + "_release": "1.0.3", "_resolution": { "type": "version", - "tag": "v1.0.2", - "commit": "cf8bdea832bfa7b4f413e021ecb328273d659b17" + "tag": "v1.0.3", + "commit": "24abacffd443f967125f5eae580eadc7b90f41c7" }, "_source": "git://github.com/polymerelements/paper-menu-button.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/paper-menu-button/bower.json b/dashboard-ui/bower_components/paper-menu-button/bower.json index 420a330513..44cd9d2478 100644 --- a/dashboard-ui/bower_components/paper-menu-button/bower.json +++ b/dashboard-ui/bower_components/paper-menu-button/bower.json @@ -1,6 +1,6 @@ { "name": "paper-menu-button", - "version": "1.0.2", + "version": "1.0.3", "description": "", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-menu-button/demo/index.html b/dashboard-ui/bower_components/paper-menu-button/demo/index.html index 3fa4e11712..1628a5f59c 100644 --- a/dashboard-ui/bower_components/paper-menu-button/demo/index.html +++ b/dashboard-ui/bower_components/paper-menu-button/demo/index.html @@ -85,7 +85,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN

              Paper Menu with multi selection

              - + @@ -147,7 +148,8 @@ Custom property | Description | Default opened: { type: Boolean, value: false, - notify: true + notify: true, + observer: '_openedChanged' }, /** @@ -205,7 +207,7 @@ Custom property | Description | Default * Set to true to disable automatically closing the dropdown after * a selection has been made. */ - ignoreActivate: { + ignoreSelect: { type: Boolean, value: false }, @@ -268,6 +270,14 @@ Custom property | Description | Default } }]; } + }, + + /** + * This is the element intended to be bound as the focus target + * for the `iron-dropdown` contained by `paper-menu-button`. + */ + _dropdownContent: { + type: Object } }, @@ -277,7 +287,14 @@ Custom property | Description | Default }, listeners: { - 'iron-activate': '_onIronActivate' + 'iron-select': '_onIronSelect' + }, + + /** + * The content element that is contained by the menu button, if any. + */ + get contentElement() { + return Polymer.dom(this.$.content).getDistributedNodes()[0]; }, /** @@ -300,14 +317,14 @@ Custom property | Description | Default }, /** - * When an `iron-activate` event is received, the dropdown should + * When an `iron-select` event is received, the dropdown should * automatically close on the assumption that a value has been chosen. * * @param {CustomEvent} event A CustomEvent instance with type - * set to `"iron-activate"`. + * set to `"iron-select"`. */ - _onIronActivate: function(event) { - if (!this.ignoreActivate) { + _onIronSelect: function(event) { + if (!this.ignoreSelect) { this.close(); } }, @@ -321,6 +338,12 @@ Custom property | Description | Default */ _openedChanged: function(opened, oldOpened) { if (opened) { + // TODO(cdata): Update this when we can measure changes in distributed + // children in an idiomatic way. + // We poke this property in case the element has changed. This will + // cause the focus target for the `iron-dropdown` to be updated as + // necessary: + this._dropdownContent = this.contentElement; this.fire('paper-dropdown-open'); } else if (oldOpened != null) { this.fire('paper-dropdown-close'); diff --git a/dashboard-ui/bower_components/paper-styles/.bower.json b/dashboard-ui/bower_components/paper-styles/.bower.json index 91d22f3562..04e2128c81 100644 --- a/dashboard-ui/bower_components/paper-styles/.bower.json +++ b/dashboard-ui/bower_components/paper-styles/.bower.json @@ -34,7 +34,7 @@ "tag": "v1.0.11", "commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c" }, - "_source": "git://github.com/polymerelements/paper-styles.git", + "_source": "git://github.com/PolymerElements/paper-styles.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-styles" + "_originalSource": "PolymerElements/paper-styles" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 5968472cc4..890d7da958 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -23,14 +23,14 @@ "web-component-tester": "*" }, "private": true, - "homepage": "https://github.com/polymer/polymer", + "homepage": "https://github.com/Polymer/polymer", "_release": "1.1.0", "_resolution": { "type": "version", "tag": "v1.1.0", "commit": "67fb2f85fd66d8556fc07cf1dec41ff5273fa68a" }, - "_source": "git://github.com/polymer/polymer.git", + "_source": "git://github.com/Polymer/polymer.git", "_target": "^1.0.0", - "_originalSource": "polymer/polymer" + "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index a1e3964911..41aa528968 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -255,6 +255,7 @@ left: 0; right: 0; text-align: center; + line-height: initial; } .cardContent .cardText { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 3a7c56b7fb..6915975aa3 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -391,7 +391,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { background-size: cover; background-position: center 15%; background-repeat: no-repeat; - height: 560px; + height: 600px; position: relative; } @@ -529,6 +529,13 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { height: 40px; } +@media all and (max-width: 1000px) { + + .detailImageContainer img { + max-width: 240px; + } +} + @media all and (max-width: 800px) { .parentName { @@ -756,56 +763,56 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { @media all and (max-height: 900px), (max-width: 800px) { .itemBackdrop:not(.noBackdrop) { - height: 500px; + height: 550px; } } @media all and (max-height: 800px), (max-width: 700px) { .itemBackdrop:not(.noBackdrop) { - height: 400px; + height: 450px; } } @media all and (max-height: 700px) { .itemBackdrop:not(.noBackdrop) { - height: 300px; + height: 350px; } } @media all and (max-width: 540px) { .itemBackdrop:not(.noBackdrop) { - height: 240px; + height: 290px; } } @media all and (max-height: 540px) { .itemBackdrop:not(.noBackdrop) { - height: 200px; + height: 250px; } } @media all and (max-height: 460px) { .itemBackdrop:not(.noBackdrop) { - height: 150px; + height: 200px; } } @media all and (max-height: 300px) { .itemBackdrop:not(.noBackdrop) { - height: 100px; + height: 150px; } } @media all and (max-height: 250px) { .itemBackdrop:not(.noBackdrop) { - height: 70px; + height: 120px; } } @@ -866,6 +873,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { max-width: 180px; } } + @media all and (min-width: 750px) { .detailPageContent { width: 950px; diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html deleted file mode 100644 index 41ac75fc1b..0000000000 --- a/dashboard-ui/itembynamedetails.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - -
              -
              - - - - - -
              -
              -               		-

              -

              - - -

              -

              -

              -

              -

              -

              - - -
              - ${ButtonPlay} - ${ButtonSync} - -
              -
              -
              -
              - ${ButtonPlay} - ${ButtonSync} - -
              -

              -
              - -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              - - diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index 73e986d5d6..18cc0d0645 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -1,345 +1,299 @@ (function ($, document, LibraryBrowser) { - var currentItem; - var shape; - var _childrenItemsFunction; + function renderItems(page, item) { - function getPromise() { - - var id = getParameterByName('id'); - - if (id) { - return ApiClient.getItem(Dashboard.getCurrentUserId(), id); - } - - var name = getParameterByName('genre'); - - if (name) { - return ApiClient.getGenre(name, Dashboard.getCurrentUserId()); - } - - name = getParameterByName('musicgenre'); - - if (name) { - return ApiClient.getMusicGenre(name, Dashboard.getCurrentUserId()); - } - - name = getParameterByName('gamegenre'); - - if (name) { - return ApiClient.getGameGenre(name, Dashboard.getCurrentUserId()); - } - - name = getParameterByName('musicartist'); - - if (name) { - return ApiClient.getArtist(name, Dashboard.getCurrentUserId()); - } - else { - throw new Error('Invalid request'); - } - } - - function reload(page) { - - Dashboard.showLoadingMsg(); - - getPromise().done(function (item) { - - var context = getParameterByName('context'); - - var editQuery = '?id=' + item.Id; - - currentItem = item; - - LibraryMenu.setTitle(item.Name); - Backdrops.setBackdrops(page, [item]); - - var name = item.Name; - - Dashboard.setPageTitle(name); - - $('.itemName', page).html(name); - - renderDetails(page, item, context); - renderTabs(page, item, context); - - $(page).trigger('displayingitem', [{ - - item: item, - context: context - }]); - - Dashboard.getCurrentUser().done(function (user) { - - if (MediaController.canPlay(item)) { - $('.btnPlay', page).visible(true); - } else { - $('.btnPlay', page).visible(false); - } - - if (SyncManager.isAvailable(item, user)) { - $('.btnSync', page).removeClass('hide'); - } else { - $('.btnSync', page).addClass('hide'); - } - - var editImagesHref = user.Policy.IsAdministrator ? 'edititemmetadata.html' + (editQuery + "&tab=3") : null; - - $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref, true)); - - if (LibraryBrowser.getMoreCommands(item, user).length) { - $('.btnMoreCommands', page).visible(true); - } else { - $('.btnMoreCommands', page).visible(false); - } - - }); - - Dashboard.hideLoadingMsg(); - }); - } - - function renderTabs(page, item, context) { - - var html = '
              '; - - html += ''; + var sections = []; if (item.MovieCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabMovies'), + type: 'Movie' + }); } if (item.SeriesCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabSeries'), + type: 'Series' + }); } if (item.EpisodeCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabEpisodes'), + type: 'Episode' + }); } if (item.TrailerCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabTrailers'), + type: 'Trailer' + }); } if (item.GameCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabGames'), + type: 'Game' + }); } if (item.AlbumCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabAlbums'), + type: 'MusicAlbum' + }); } if (item.SongCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabSongs'), + type: 'Audio' + }); } if (item.MusicVideoCount) { - html += ''; - html += ''; + sections.push({ + name: Globalize.translate('TabMusicVideos'), + type: 'MusicVideo' + }); } - html += '
              '; + var elem = page.querySelector('#childrenContent'); - var elem = $('#itemTabs', page).html(html).trigger('create'); + elem.innerHTML = sections.map(function (section) { - bindRadioEvents(page); + var html = ''; - var selectedRadio = null; + html += '
              '; - if (context) { - selectedRadio = $('.context-' + context + ':first', elem); + html += '
              '; + html += '

              '; + html += section.name; + html += '

              '; + html += '' + Globalize.translate('ButtonMore') + ''; + html += '
              '; + + html += '
              '; + html += '
              '; + + html += '
              '; + + return html; + + }).join(''); + + var sectionElems = elem.querySelectorAll('.homePageSection'); + for (var i = 0, length = sectionElems.length; i < length; i++) { + renderSection(page, item, sectionElems[i], sectionElems[i].getAttribute('data-type')); } - - if (selectedRadio && selectedRadio.length) { - selectedRadio.attr("checked", "checked").checkboxradio("refresh").trigger('click'); - } else { - $('input:first', elem).attr("checked", "checked").checkboxradio("refresh").trigger('click'); - } - } - function bindRadioEvents(page) { + function renderSection(page, item, element, type) { - $("#radioMusicVideos", page).on("click", function () { + switch (type) { - shape = "poster"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "MusicVideo", - PersonTypes: "", - ArtistIds: "" - }); + case 'Movie': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Movie", + PersonTypes: "", + ArtistIds: "", + Limit: 10 + }, { + shape: "detailPagePortrait", + showTitle: true, + centerText: true, + overlayPlayButton: true + }); + break; - }); + case 'MusicVideo': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "MusicVideo", + PersonTypes: "", + ArtistIds: "", + Limit: 10 + }, { + shape: "detailPagePortrait", + showTitle: true, + centerText: true, + overlayPlayButton: true + }); + break; - $("#radioMovies", page).on("click", function () { + case 'Game': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Game", + PersonTypes: "", + ArtistIds: "", + Limit: 10 + }, { + shape: "detailPagePortrait", + showTitle: true, + centerText: true + }); + break; - shape = "poster"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "Movie", - PersonTypes: "", - ArtistIds: "" - }); + case 'Trailer': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Trailer", + PersonTypes: "", + ArtistIds: "", + Limit: 10 + }, { + shape: "detailPagePortrait", + showTitle: true, + centerText: true, + overlayPlayButton: true + }); + break; - }); + case 'Series': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Series", + PersonTypes: "", + ArtistIds: "", + Limit: 10 + }, { + shape: "detailPagePortrait", + showTitle: true, + centerText: true + }); + break; - $("#radioShows", page).on("click", function () { + case 'MusicAlbum': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "MusicAlbum", + PersonTypes: "", + ArtistIds: "", + Limit: 8 + }, { + shape: "detailPageSquare", + playFromHere: true, + showTitle: true, + showParentTitle: true, + centerText: true, + overlayPlayButton: true + }); + break; - shape = "poster"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "Series", - PersonTypes: "", - ArtistIds: "" - }); - }); + case 'Episode': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Episode", + PersonTypes: "", + ArtistIds: "", + Limit: 6 + }, { + shape: "detailPage169", + showTitle: true, + showParentTitle: true, + centerText: true, + overlayPlayButton: true + }); + break; - $("#radioTrailers", page).on("click", function () { + case 'Audio': + loadItems(element, item, type, { + MediaTypes: "", + IncludeItemTypes: "Audio", + PersonTypes: "", + ArtistIds: "", + Limit: 100 + }, { + playFromHere: true, + defaultAction: 'playallfromhere', + smallIcon: true + }); + break; - shape = "poster"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "Trailer", - PersonTypes: "", - ArtistIds: "" - }); - }); - - $("#radioGames", page).on("click", function () { - - shape = "poster"; - loadItems(page, { - IncludeItemTypes: "", - MediaTypes: "Game", - PersonTypes: "", - ArtistIds: "" - }); - }); - - $("#radioEpisodes", page).on("click", function () { - - shape = "backdrop"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "Episode", - PersonTypes: "", - ArtistIds: "" - }); - }); - - $("#radioAlbums", page).on("click", function () { - - shape = "square"; - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "MusicAlbum", - PersonTypes: "", - ArtistIds: "" - }); - }); - - $("#radioSongs", page).on("click", function () { - - loadItems(page, { - MediaTypes: "", - IncludeItemTypes: "Audio", - PersonTypes: "", - ArtistIds: "" - }); - }); + default: + break; + } } - function renderDetails(page, item, context) { + function loadItems(element, item, type, query, listOptions) { - //LibraryBrowser.renderDetailPageBackdrop(page, item); - LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), item); + query = getQuery(query, item); - renderUserDataIcons(page, item); - LibraryBrowser.renderLinks(page.querySelector('#itemLinks'), item); + getItemsFunction(query, item)(query.StartIndex, query.Limit, query.Fields).done(function (result) { - LibraryBrowser.renderGenres($('.itemGenres', page), item, context); + var html = ''; - if (item.Type == "Person" && item.PremiereDate) { - - try { - var birthday = parseISO8601Date(item.PremiereDate, { toLocal: true }).toDateString(); - - $('#itemBirthday', page).show().html(Globalize.translate('BirthDateValue').replace('{0}', birthday)); + if (query.Limit && result.TotalRecordCount > query.Limit) { + // Add more button + var link = element.querySelector('a'); + link.classList.remove('hide'); + link.setAttribute('href', getMoreItemsHref(item, type)); + } else { + element.querySelector('a').classList.add('hide'); } - catch (err) { - $('#itemBirthday', page).hide(); + + listOptions.items = result.Items; + var trigger = false; + + if (type == 'Audio') { + html = LibraryBrowser.getListViewHtml(listOptions); + trigger = true; + } else { + html = LibraryBrowser.getPosterViewHtml(listOptions); } - } else { - $('#itemBirthday', page).hide(); + + var itemsContainer = element.querySelector('.itemsContainer'); + itemsContainer.innerHTML = html; + + $(itemsContainer).createCardMenus(); + + if (trigger) { + $(itemsContainer).trigger('create'); + } + ImageLoader.lazyChildren(itemsContainer); + }); + } + + function getMoreItemsHref(item, type) { + + return 'secondaryitems.html?type=' + type + '&parentid=' + item.Id; + } + + function addCurrentItemToQuery(query, item) { + + if (item.Type == "Person") { + query.PersonIds = item.Id; } - - if (item.Type == "Person" && item.EndDate) { - - try { - var deathday = parseISO8601Date(item.EndDate, { toLocal: true }).toDateString(); - - $('#itemDeathDate', page).show().html(Globalize.translate('DeathDateValue').replace('{0}', deathday)); - } - catch (err) { - $('#itemBirthday', page).hide(); - } - } else { + else if (item.Type == "Genre") { + query.Genres = item.Name; } - - if (item.Type == "Person" && item.ProductionLocations && item.ProductionLocations.length) { - - var gmap = '' + item.ProductionLocations[0] + ''; - - $('#itemBirthLocation', page).show().html(Globalize.translate('BirthPlaceValue').replace('{0}', gmap)).trigger('create'); - } else { - $('#itemBirthLocation', page).hide(); + else if (item.Type == "MusicGenre") { + query.Genres = item.Name; + } + else if (item.Type == "GameGenre") { + query.Genres = item.Name; + } + else if (item.Type == "Studio") { + query.StudioIds = item.Id; + } + else if (item.Type == "MusicArtist") { + query.ArtistIds = item.Id; } } - function renderUserDataIcons(page, item) { - $('.userDataIcons', page).html(LibraryBrowser.getUserDataIconsHtml(item)); - } - - function addCurrentItemToQuery(query) { - - if (currentItem.Type == "Person") { - query.PersonIds = currentItem.Id; - } - else if (currentItem.Type == "Genre") { - query.Genres = currentItem.Name; - } - else if (currentItem.Type == "MusicGenre") { - query.Genres = currentItem.Name; - } - else if (currentItem.Type == "GameGenre") { - query.Genres = currentItem.Name; - } - else if (currentItem.Type == "Studio") { - query.StudioIds = currentItem.Id; - } - else if (currentItem.Type == "MusicArtist") { - query.ArtistIds = currentItem.Id; - } - } - - function getQuery(options) { + function getQuery(options, item) { var query = { @@ -359,14 +313,14 @@ query.SortBy = "AlbumArtist,Album,SortName"; } - addCurrentItemToQuery(query); + addCurrentItemToQuery(query, item); return query; } - function getItemsFunction(options) { + function getItemsFunction(options, item) { - var query = getQuery(options); + var query = getQuery(options, item); return function (index, limit, fields) { @@ -383,187 +337,8 @@ } - function loadItems(page, options) { - - Dashboard.showLoadingMsg(); - - _childrenItemsFunction = getItemsFunction(options); - - var query = getQuery(options); - - getItemsFunction(options)(options.StartIndex, options.Limit, options.Fields).done(function (result) { - - var html = ''; - - if (result.TotalRecordCount > query.Limit) { - - var pagingHtml = LibraryBrowser.getQueryPagingHtml({ - startIndex: query.StartIndex, - limit: query.Limit, - totalRecordCount: result.TotalRecordCount, - showLimit: false, - updatePageSizeSetting: false - }); - - page.querySelector('.listTopPaging').innerHTML = pagingHtml; - - $('.viewSettings', page).show(); - } else { - $('.listTopPaging', page).html(''); - $('.viewSettings', page).hide(); - } - - var screenWidth = $(window).width(); - - if (query.IncludeItemTypes == "Audio") { - - html = "
              " + LibraryBrowser.getListViewHtml({ - items: result.Items, - playFromHere: true, - defaultAction: 'playallfromhere', - smallIcon: true - }) + "
              "; - } - else if (query.IncludeItemTypes == "Movie" || query.IncludeItemTypes == "Trailer") { - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "portrait", - context: 'movies', - showTitle: true, - centerText: true - }); - - } - else if (query.IncludeItemTypes == "Episode") { - - html += LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "backdrop", - showTitle: true, - showParentTitle: true, - overlayText: screenWidth >= 600 - }); - - } - else if (query.IncludeItemTypes == "Series") { - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "backdrop", - preferThumb: true, - context: 'tv' - }); - - } - else if (query.IncludeItemTypes == "MusicAlbum") { - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "square", - context: 'music', - playFromHere: true, - showTitle: true, - showParentTitle: true - }); - - } - else { - - html = "
              " + LibraryBrowser.getListViewHtml({ - items: result.Items, - smallIcon: true - }) + "
              "; - } - - html += LibraryBrowser.getQueryPagingHtml({ - startIndex: query.StartIndex, - limit: query.Limit, - totalRecordCount: result.TotalRecordCount, - showLimit: false, - updatePageSizeSetting: false - }); - - var elem = page.querySelector('#items'); - elem.innerHTML = html; - ImageLoader.lazyChildren(elem); - - // Do we still need this? - $(elem).trigger('create'); - - $('.btnNextPage', page).on('click', function () { - - query.StartIndex = query.StartIndex + query.Limit; - loadItems(page, query); - }); - - $('.btnPreviousPage', page).on('click', function () { - - query.StartIndex = query.StartIndex - query.Limit; - loadItems(page, query); - }); - - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - loadItems(page, query); - }); - - Dashboard.hideLoadingMsg(); - }); - } - - $(document).on('pageinitdepends', "#itemByNameDetailPage", function () { - - var page = this; - - $('.btnPlay', page).on('click', function () { - var userdata = currentItem.UserData || {}; - LibraryBrowser.showPlayMenu(this, currentItem.Id, currentItem.Type, false, "Audio", userdata.PlaybackPositionTicks); - }); - - $('.itemsContainer', page).on('playallfromhere', function (e, index) { - - LibraryBrowser.playAllFromHere(_childrenItemsFunction, index); - - }).on('queueallfromhere', function (e, index) { - - LibraryBrowser.queueAllFromHere(_childrenItemsFunction, index); - - }); - - $('.btnMoreCommands', page).on('click', function () { - - var button = this; - - Dashboard.getCurrentUser().done(function (user) { - - LibraryBrowser.showMoreCommands(button, currentItem.Id, LibraryBrowser.getMoreCommands(currentItem, user)); - }); - }); - - $('.btnSync', page).on('click', function () { - - SyncManager.showMenu({ - items: [currentItem] - }); - }); - - var btnMore = page.querySelectorAll('.btnMoreCommands iron-icon'); - for (var i = 0, length = btnMore.length; i < length; i++) { - btnMore[i].icon = AppInfo.moreIcon; - } - - }).on('pagebeforeshowready', "#itemByNameDetailPage", function () { - - var page = this; - - reload(page); - - }).on('pagebeforehide', "#itemByNameDetailPage", function () { - - currentItem = null; - }); - + window.ItemsByName = { + renderItems: renderItems + }; })(jQuery, document, LibraryBrowser); \ No newline at end of file diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 962f35fc46..97da04e451 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -2,13 +2,47 @@ var currentItem; - function reload(page) { + function getPromise() { var id = getParameterByName('id'); + if (id) { + return ApiClient.getItem(Dashboard.getCurrentUserId(), id); + } + + var name = getParameterByName('genre'); + + if (name) { + return ApiClient.getGenre(name, Dashboard.getCurrentUserId()); + } + + name = getParameterByName('musicgenre'); + + if (name) { + return ApiClient.getMusicGenre(name, Dashboard.getCurrentUserId()); + } + + name = getParameterByName('gamegenre'); + + if (name) { + return ApiClient.getGameGenre(name, Dashboard.getCurrentUserId()); + } + + name = getParameterByName('musicartist'); + + if (name) { + return ApiClient.getArtist(name, Dashboard.getCurrentUserId()); + } + else { + throw new Error('Invalid request'); + } + } + + function reload(page) { + Dashboard.showLoadingMsg(); - ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) { + getPromise().done(function (item) { reloadFromItem(page, item); }); @@ -251,6 +285,11 @@ $('#childrenCollapsible', page).removeClass('hide'); renderChannelGuide(page, item, user); } + else if (item.Type == 'Studio' || item.Type == 'Person' || item.Type == 'Genre' || item.Type == 'MusicGenre' || item.Type == 'GameGenre' || item.Type == 'MusicArtist') { + + $('#childrenCollapsible', page).removeClass('hide'); + renderItemsByName(page, item, user); + } else if (item.IsFolder) { if (item.Type == "BoxSet") { @@ -460,7 +499,7 @@ var artist = artists[i]; - html.push('' + artist.Name + ''); + html.push('' + artist.Name + ''); } @@ -620,7 +659,7 @@ } if (item.Studios.length) { - html += ' on ' + item.Studios[0].Name + ''; + html += ' on ' + item.Studios[0].Name + ''; } if (html) { @@ -833,6 +872,15 @@ } } + function renderItemsByName(page, item, user) { + + require('scripts/itembynamedetailpage'.split(','), function () { + + + window.ItemsByName.renderItems(page, item); + }); + } + function renderChannelGuide(page, item, user) { require('scripts/livetvcomponents,scripts/livetvchannel,livetvcss'.split(','), function () { @@ -1438,7 +1486,7 @@ } var cast = casts[i]; - var href = isStatic ? '#' : 'itembynamedetails.html?context=' + context + '&id=' + cast.Id + ''; + var href = isStatic ? '#' : 'itemdetails.html?context=' + context + '&id=' + cast.Id + ''; html += ''; var imgUrl; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index c04a698215..ce47e23d6d 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -428,7 +428,7 @@ var artist = artists[i]; var css = cssClass ? (' class="' + cssClass + '"') : ''; - html.push('' + artist.Name + ''); + html.push('' + artist.Name + ''); } @@ -824,26 +824,26 @@ return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "Genre") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "MusicGenre") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "GameGenre") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "Studio") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "Person") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.Type == "Recording") { return "itemdetails.html?id=" + id; } if (item.Type == "MusicArtist") { - return "itembynamedetails.html?id=" + id + contextSuffix; + return "itemdetails.html?id=" + id + contextSuffix; } if (item.IsFolder) { @@ -3176,7 +3176,7 @@ if (isStatic) { html += item.Studios[i].Name; } else { - html += '' + item.Studios[i].Name + ''; + html += '' + item.Studios[i].Name + ''; } } @@ -3217,7 +3217,7 @@ if (isStatic) { html += genres[i]; } else { - html += '' + genres[i] + ''; + html += '' + genres[i] + ''; } } diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 199d2a5442..b0ee602660 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -417,13 +417,13 @@ Dashboard.navigate('itemdetails.html?id=' + albumid); break; case 'artist': - Dashboard.navigate('itembynamedetails.html?context=music&id=' + artistid); + Dashboard.navigate('itemdetails.html?context=music&id=' + artistid); break; case 'play': MediaController.play(itemId); break; case 'playallfromhere': - $(card).parents('.itemsContainer').trigger('playallfromhere', [index]); + playAllFromHere(index, $(card).parents('.itemsContainer'), 'play'); break; case 'queue': MediaController.queue(itemId); @@ -440,7 +440,7 @@ }); break; case 'queueallfromhere': - $(card).parents('.itemsContainer').trigger('queueallfromhere', [index]); + playAllFromHere(index, $(card).parents('.itemsContainer'), 'queue'); break; case 'sync': SyncManager.showMenu({ @@ -1145,12 +1145,34 @@ index = elemWithAttributes.getAttribute('data-index'); itemsContainer = $(elem).parents('.itemsContainer'); - itemsContainer.trigger('playallfromhere', [index]); + playAllFromHere(index, itemsContainer, 'play'); } return false; } + function playAllFromHere(index, itemsContainer, method) { + + var ids = $('.mediaItem', itemsContainer).get().map(function(i) { + return i.getAttribute('data-itemid') || i.parentNode.getAttribute('data-itemid'); + }); + + ids = ids.slice(index); + + ApiClient.getItems(Dashboard.getCurrentUserId(), { + + Ids: ids.join(','), + Fields: 'MediaSources,Chapters', + Limit: 100 + + }).done(function (result) { + + MediaController[method]({ + items: result.Items + }); + }); + } + $(document).on('pageinitdepends', ".libraryPage", function () { var page = this; diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index e9cf6b5033..f95b698bc2 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -78,7 +78,7 @@ html += ''; - html += ''; + html += ''; html += ''; } diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js index ef11e56f42..f7835dfab0 100644 --- a/dashboard-ui/scripts/livetvtimers.js +++ b/dashboard-ui/scripts/livetvtimers.js @@ -101,7 +101,7 @@ html += '
              '; } - html += ''; + html += ''; html += ''; } diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js index 6fc52a8393..8f990d810d 100644 --- a/dashboard-ui/scripts/reports.js +++ b/dashboard-ui/scripts/reports.js @@ -106,7 +106,7 @@ html += '' + rItem.Name + ''; break; case "ItemByNameDetails": - html += '' + rItem.Name + ''; + html += '' + rItem.Name + ''; break; case "EmbeddedImage": if (rRow.HasEmbeddedImage) { @@ -237,7 +237,7 @@ var rItem = group.Items[j]; html += ' "") - html += ' href="itembynamedetails.html?id=' + rItem.Id + '"'; + html += ' href="itemdetails.html?id=' + rItem.Id + '"'; html += '>' + rItem.Name + ' ' + ''; html += '' + rItem.Value + ' ' + ''; } diff --git a/dashboard-ui/scripts/secondaryitems.js b/dashboard-ui/scripts/secondaryitems.js index c61a02dbcd..4a72f9af21 100644 --- a/dashboard-ui/scripts/secondaryitems.js +++ b/dashboard-ui/scripts/secondaryitems.js @@ -1,10 +1,32 @@ (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); - var data = {}; - function getQuery() { + function addCurrentItemToQuery(query, item) { + + if (item.Type == "Person") { + query.PersonIds = item.Id; + } + else if (item.Type == "Genre") { + query.Genres = item.Name; + } + else if (item.Type == "MusicGenre") { + query.Genres = item.Name; + } + else if (item.Type == "GameGenre") { + query.Genres = item.Name; + } + else if (item.Type == "Studio") { + query.StudioIds = item.Id; + } + else if (item.Type == "MusicArtist") { + query.ArtistIds = item.Id; + } else { + query.ParentId = item.Id; + } + } + + function getQuery(parentItem) { var key = getSavedQueryKey(); var pageData = data[key]; @@ -33,7 +55,10 @@ pageData.query.Filters = filters; } - pageData.query.ParentId = getParameterByName('parentid') || LibraryMenu.getTopParentId(); + if (parentItem) { + addCurrentItemToQuery(pageData.query, parentItem); + } + LibraryBrowser.loadSavedQueryValues(key, pageData.query); } return pageData.query; @@ -59,11 +84,11 @@ } } - function reloadItems(page) { + function reloadItems(page, parentItem) { Dashboard.showLoadingMsg(); - var query = getQuery(); + var query = getQuery(parentItem); ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) { @@ -79,46 +104,63 @@ }); page.querySelector('.listTopPaging').innerHTML = pagingHtml; + var trigger = false; - var posterOptions = { - items: result.Items, - shape: "auto", - centerText: true, - lazy: true, - overlayText: true - }; + if (query.IncludeItemTypes == "Audio") { - if (query.IncludeItemTypes == "MusicAlbum") { - posterOptions.overlayText = false; - posterOptions.showParentTitle = true; - posterOptions.overlayPlayButton = true; - } - else if (query.IncludeItemTypes == "MusicArtist") { - posterOptions.overlayText = false; - posterOptions.overlayPlayButton = true; - } - else if (query.IncludeItemTypes == "Episode") { - posterOptions.overlayText = false; - posterOptions.showParentTitle = true; - posterOptions.overlayPlayButton = true; - posterOptions.centerText = false; - } + html = '
              ' + LibraryBrowser.getListViewHtml({ + items: result.Items, + playFromHere: true, + defaultAction: 'playallfromhere', + smallIcon: true + }) + '
              '; + trigger = true; - // Poster - html = LibraryBrowser.getPosterViewHtml(posterOptions); + } else { + var posterOptions = { + items: result.Items, + shape: "auto", + centerText: true, + lazy: true, + overlayText: true + }; + + if (query.IncludeItemTypes == "MusicAlbum") { + posterOptions.overlayText = false; + posterOptions.showParentTitle = true; + posterOptions.overlayPlayButton = true; + } + else if (query.IncludeItemTypes == "MusicArtist") { + posterOptions.overlayText = false; + posterOptions.overlayPlayButton = true; + } + else if (query.IncludeItemTypes == "Episode") { + posterOptions.overlayText = false; + posterOptions.showParentTitle = true; + posterOptions.overlayPlayButton = true; + posterOptions.centerText = false; + } + + // Poster + html = LibraryBrowser.getPosterViewHtml(posterOptions); + } var elem = page.querySelector('#items'); elem.innerHTML = html + pagingHtml; ImageLoader.lazyChildren(elem); + if (trigger) { + $(elem).trigger('create'); + } + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; - reloadItems(page); + reloadItems(page, parentItem); }); $('.btnPreviousPage', page).on('click', function () { query.StartIndex -= query.Limit; - reloadItems(page); + reloadItems(page, parentItem); }); LibraryBrowser.setLastRefreshed(page); @@ -139,10 +181,14 @@ if (getParameterByName('parentid')) { ApiClient.getItem(Dashboard.getCurrentUserId(), getParameterByName('parentid')).done(function (parent) { LibraryMenu.setTitle(parent.Name); + + if (LibraryBrowser.needsRefresh(page)) { + reloadItems(page, parent); + } }); } - if (LibraryBrowser.needsRefresh(page)) { + else if (LibraryBrowser.needsRefresh(page)) { reloadItems(page); } }); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 0f7e60fed6..164ff82fec 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1173,22 +1173,22 @@ var Dashboard = { var type = (cmd.ItemType || "").toLowerCase(); if (type == "genre") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } else if (type == "musicgenre") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } else if (type == "gamegenre") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } else if (type == "studio") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } else if (type == "person") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } else if (type == "musicartist") { - url = "itembynamedetails.html?id=" + cmd.ItemId; + url = "itemdetails.html?id=" + cmd.ItemId; } if (url) { diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html index c7416cf1a2..a68af9f3ee 100644 --- a/dashboard-ui/thirdparty/emby-icons.html +++ b/dashboard-ui/thirdparty/emby-icons.html @@ -126,6 +126,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for + diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index 80c925b2ad..263056bf82 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -18671,6 +18671,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN +