diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c19dd451fc..76561b21a4 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.183", - "_release": "1.4.183", + "version": "1.4.184", + "_release": "1.4.184", "_resolution": { "type": "version", - "tag": "1.4.183", - "commit": "0548902d94131fb45ba17c421186014b0bed5e18" + "tag": "1.4.184", + "commit": "78fbf509947ae091e7f023d11cd2cb1f7f902bf2" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index d91c37a1bd..4f09d0e546 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -706,7 +706,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo var html = ''; - var showOtherText = isOuterFooter ? !options.overlayText : options.overlayText; + var showOtherText = isOuterFooter ? !overlayText : overlayText; if (isOuterFooter && options.cardLayout && !layoutManager.tv) { var moreIcon = appHost.moreIcon == 'dots-horiz' ? '' : ''; @@ -719,7 +719,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (showOtherText) { var parentTitleUnderneath = item.Type == 'MusicAlbum' || item.Type == 'Audio' || item.Type == 'MusicVideo'; - if (options.showParentTitle && !parentTitleUnderneath) { + if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) { if (isOuterFooter && item.Type == 'Episode' && item.SeriesName && item.SeriesId) { @@ -732,12 +732,16 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } else { - lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); + var parentTitle = item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""); + + if (parentTitle || options.showParentTitle) { + lines.push(parentTitle); + } } } } - if (showTitle || forceName) { + if (showTitle || forceName || (options.showParentTitleOrTitle && !lines.length)) { var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : itemHelper.getDisplayName(item); @@ -834,7 +838,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo lines.push(airTimeText || ''); } - if (item.Type == 'TvChannel') { + if (options.showCurrentProgram && item.Type == 'TvChannel') { if (item.CurrentProgram) { lines.push(itemHelper.getDisplayName(item.CurrentProgram)); diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index 88cf918b62..8a61521470 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -251,7 +251,7 @@ } .channelPrograms, .channelHeaderCell { - height: 4em; + height: 3.8em; } .channelTimeslotHeader { diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index e1304d174b..db341575ee 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -1,6 +1,6 @@ { "name": "iron-meta", - "version": "1.1.1", + "version": "1.1.2", "keywords": [ "web-components", "polymer" @@ -22,16 +22,17 @@ "paper-styles": "polymerelements/paper-styles#^1.0.4", "iron-component-page": "polymerelements/iron-component-page#^1.0.0", "test-fixture": "polymerelements/test-fixture#^1.0.0", - "web-component-tester": "*", + "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", + "ignore": [], "homepage": "https://github.com/PolymerElements/iron-meta", - "_release": "1.1.1", + "_release": "1.1.2", "_resolution": { "type": "version", - "tag": "v1.1.1", - "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" + "tag": "v1.1.2", + "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a" }, "_source": "git://github.com/PolymerElements/iron-meta.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/iron-meta/.github/ISSUE_TEMPLATE.md b/dashboard-ui/bower_components/iron-meta/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000000..2e81711396 --- /dev/null +++ b/dashboard-ui/bower_components/iron-meta/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,33 @@ + +### Description + + +### Expected outcome + + + +### Actual outcome + + + +### Live Demo + + +### Steps to reproduce + + + +### Browsers Affected + +- [ ] Chrome +- [ ] Firefox +- [ ] Safari 9 +- [ ] Safari 8 +- [ ] Safari 7 +- [ ] Edge +- [ ] IE 11 +- [ ] IE 10 diff --git a/dashboard-ui/bower_components/iron-meta/.travis.yml b/dashboard-ui/bower_components/iron-meta/.travis.yml index fd27446be5..39e072eaa8 100644 --- a/dashboard-ui/bower_components/iron-meta/.travis.yml +++ b/dashboard-ui/bower_components/iron-meta/.travis.yml @@ -1,28 +1,23 @@ language: node_js -sudo: false -matrix: - include: - - node_js: stable - script: xvfb-run wct - addons: - firefox: latest - apt: - sources: - - google-chrome - packages: - - google-chrome-stable - - node_js: node - script: - - | - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - wct -s 'default' - fi +sudo: required before_script: -- npm install web-component-tester -- npm install bower -- export PATH=$PWD/node_modules/.bin:$PATH +- npm install -g bower polylint web-component-tester - bower install +- polylint env: global: - - secure: eGcuDAJt+1GPrC6u95vHufjnSXWbVBZpW7oKQhZjcHrN19l9COdOb7RVkTPsZzEanHaH/D6Psr4WJKyd72Wx5wj+bqGh4nPHTFSnK3+gNT4eJAgLvsxLwHxW8QkYYHEdZe8Wd6sOdal9geeLZ8fG9xELYEtuJR6lww5uLvFv/cw= - - secure: DoBz8LDaS4/lQ9sTXE5pnp8fqEvG47mmdQaQ14EnHQ+wLbajIaLk59vRfau5c7mIef8dEgaT40r/kVP5QRr3OiH5UJY3jLnCMVIxWJ3ZTkuGGuU6QDQvoGSSBhdA+b+G94bbK6LtHQxRBrkiyT9d0IzT5ZiHlDlteGbjdDWAgw0= + - secure: mjikUCoN+UpTbFHwbGXUoKp4vtZ2qNN1JYW79WcOik7fCFmvdFzfYQPDa6y9aJvU3kgkDndGdR/ynLG4kejZjmqTS5fYtdHEwpPVPapbVYnquJvCJKbMN4S2QpGCoq51pjKQ8U3Ys6G5HkmdcDfw3SKk1uMgVzKV7fEI+6WnZ/M= + - secure: LHDnBtwK7yO2X4GNmIaAl7t85WWc1U189OiPqemD27+jTcKml0by1n9Mu/yrg94jYgeXab9mHgU3uMtIdQstNNwTDu8CgmmIP4H2EWopHrTi3KM7Z7aeofPgMJsVFXwg+WhNlcCfhEsygHZWTxjJXM4fcGOrFPDa4+BTgRa2hEE= +node_js: stable +addons: + firefox: '46.0' + apt: + sources: + - google-chrome + packages: + - google-chrome-stable + sauce_connect: true +script: +- xvfb-run wct +- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s 'default'; fi +dist: trusty diff --git a/dashboard-ui/bower_components/iron-meta/CONTRIBUTING.md b/dashboard-ui/bower_components/iron-meta/CONTRIBUTING.md index 7b10141565..093090d435 100644 --- a/dashboard-ui/bower_components/iron-meta/CONTRIBUTING.md +++ b/dashboard-ui/bower_components/iron-meta/CONTRIBUTING.md @@ -1,11 +1,16 @@ - + # Polymer Elements ## Guide for Contributors @@ -41,7 +46,7 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag 3. Click the `paper-foo` element. ``` - 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output). + 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [https://jsbin.com/cagaye/edit?html,output](https://jsbin.com/cagaye/edit?html,output). 3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers. @@ -51,14 +56,14 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag When submitting pull requests, please provide: - 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax: + 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues in the pull request description using the following syntax: ```markdown (For a single issue) Fixes #20 (For multiple issues) - Fixes #32, #40 + Fixes #32, fixes #40 ``` 2. **A succinct description of the design** used to fix any related issues. For example: diff --git a/dashboard-ui/bower_components/iron-meta/bower.json b/dashboard-ui/bower_components/iron-meta/bower.json index 614c5b3a66..d457e06e49 100644 --- a/dashboard-ui/bower_components/iron-meta/bower.json +++ b/dashboard-ui/bower_components/iron-meta/bower.json @@ -1,6 +1,6 @@ { "name": "iron-meta", - "version": "1.1.1", + "version": "1.1.2", "keywords": [ "web-components", "polymer" @@ -22,8 +22,9 @@ "paper-styles": "polymerelements/paper-styles#^1.0.4", "iron-component-page": "polymerelements/iron-component-page#^1.0.0", "test-fixture": "polymerelements/test-fixture#^1.0.0", - "web-component-tester": "*", + "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "main": "iron-meta.html" + "main": "iron-meta.html", + "ignore": [] } diff --git a/dashboard-ui/bower_components/iron-meta/demo/index.html b/dashboard-ui/bower_components/iron-meta/demo/index.html index 3deee3cbd5..0fc39e30ef 100644 --- a/dashboard-ui/bower_components/iron-meta/demo/index.html +++ b/dashboard-ui/bower_components/iron-meta/demo/index.html @@ -22,22 +22,52 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
-value
stored at key="info"
is
.
value(s)
stored at type="type1"
are:
.value(s)
stored at type="type2"
are:
.
+