diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c5989fc982..6714236045 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.29", - "_release": "1.1.29", + "version": "1.1.30", + "_release": "1.1.30", "_resolution": { "type": "version", - "tag": "1.1.29", - "commit": "5884bd203d5dcf32cc0e325018284bd078ac0c41" + "tag": "1.1.30", + "commit": "25a55da9b6507b8e0b81dbde2c69f21af98abce8" }, "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_target": "~1.1.5", diff --git a/dashboard-ui/bower_components/emby-webcomponents/visibleinviewport.js b/dashboard-ui/bower_components/emby-webcomponents/visibleinviewport.js index 74202df5b0..faa3b1b544 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/visibleinviewport.js +++ b/dashboard-ui/bower_components/emby-webcomponents/visibleinviewport.js @@ -17,6 +17,10 @@ var vpWidth = window.innerWidth, vpHeight = window.innerHeight; + + if (!elem.getBoundingClientRect){ + return true; + } // Use this native browser method, if available. var rec = elem.getBoundingClientRect(), diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index fedc85052e..1a5c3225cc 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -1,6 +1,6 @@ { "name": "iron-selector", - "version": "1.2.4", + "version": "1.2.5", "description": "Manages a set of elements that can be selected", "private": true, "license": "http://polymer.github.io/LICENSE.txt", @@ -30,11 +30,11 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.2.4", + "_release": "1.2.5", "_resolution": { "type": "version", - "tag": "v1.2.4", - "commit": "1ee4e2e11a9e5118320987d93fc2c03ae9a489f4" + "tag": "v1.2.5", + "commit": "06bd256eacfd70f959c4aed8c03c221f01074c0f" }, "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/iron-selector/bower.json b/dashboard-ui/bower_components/iron-selector/bower.json index a183552710..4cdf949e62 100644 --- a/dashboard-ui/bower_components/iron-selector/bower.json +++ b/dashboard-ui/bower_components/iron-selector/bower.json @@ -1,6 +1,6 @@ { "name": "iron-selector", - "version": "1.2.4", + "version": "1.2.5", "description": "Manages a set of elements that can be selected", "private": true, "license": "http://polymer.github.io/LICENSE.txt", diff --git a/dashboard-ui/bower_components/iron-selector/iron-selectable.html b/dashboard-ui/bower_components/iron-selector/iron-selectable.html index 78d509572e..2a02eb2f07 100644 --- a/dashboard-ui/bower_components/iron-selector/iron-selectable.html +++ b/dashboard-ui/bower_components/iron-selector/iron-selectable.html @@ -46,8 +46,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN properties: { /** - * If you want to use the attribute value of an element for `selected` instead of the index, - * set this to the name of the attribute. + * If you want to use an attribute value or property of an element for + * `selected` instead of the index, set this to the name of the attribute + * or property. Hyphenated values are converted to camel case when used to + * look up the property of a selectable element. Camel cased values are + * *not* converted to hyphenated values for attribute lookup. It's + * recommended that you provide the hyphenated form of the name so that + * selection works in both cases. (Use `attr-or-property-name` instead of + * `attrOrPropertyName`.) */ attrForSelected: { type: String, @@ -288,7 +294,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }, _valueForItem: function(item) { - var propValue = item[this.attrForSelected]; + var propValue = item[Polymer.CaseMap.dashToCamelCase(this.attrForSelected)]; return propValue != undefined ? propValue : item.getAttribute(this.attrForSelected); }, diff --git a/dashboard-ui/bower_components/iron-selector/test/attr-for-selected-elements.html b/dashboard-ui/bower_components/iron-selector/test/attr-for-selected-elements.html new file mode 100644 index 0000000000..3acae81bbf --- /dev/null +++ b/dashboard-ui/bower_components/iron-selector/test/attr-for-selected-elements.html @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/dashboard-ui/bower_components/iron-selector/test/attr-for-selected.html b/dashboard-ui/bower_components/iron-selector/test/attr-for-selected.html new file mode 100644 index 0000000000..59298af5c0 --- /dev/null +++ b/dashboard-ui/bower_components/iron-selector/test/attr-for-selected.html @@ -0,0 +1,163 @@ + + + + + + + iron-selector attr-for-selected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 2b04bf9f8a..a6b333d335 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -45,7 +45,7 @@ "tag": "v1.0.11", "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 157225ee71..2f654d71c6 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 8c842d3f1d..2871bbb17f 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -271,8 +271,13 @@ $('#txtSignupPassword', page).val(''); $('#txtSignupPasswordConfirm', page).val(''); - var link = 'http://emby.media'; - $('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link)); + if (browserInfo.safari && AppInfo.isNativeApp) { + // With apple we can't even have a link to the site + $('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessageWithoutLink')); + } else { + var link = 'http://emby.media'; + $('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link)); + } }).on('pageshow', "#connectLoginPage", function () { diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index 0052289002..8f4c1ecf06 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -512,11 +512,9 @@ function enableNativeTrackSupport(track) { - if (browserInfo.safari) { - if (navigator.userAgent.toLowerCase().indexOf('os x') == -1) { - // Leave it to apple to have different behavior between safari on ios vs osx - return false; - } + if (browserInfo.safari && browserInfo.mobile) { + // Leave it to apple to have different behavior between safari on ios vs osx + return false; } if (browserInfo.firefox) { @@ -648,7 +646,7 @@ console.log('expectedId: ' + expectedId + '--currentTrack.Id:' + currentTrack.id); // IE doesn't support track id - if (browserInfo.msie) { + if (browserInfo.msie || browserInfo.edge) { if (trackIndex == i) { mode = 1; // show this track } else { diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json index 66237c8074..a60c5d79b7 100644 --- a/dashboard-ui/strings/server.json +++ b/dashboard-ui/strings/server.json @@ -2294,6 +2294,7 @@ "LabelProfile": "Profile:", "LabelBitrateMbps": "Bitrate (Mbps):", "EmbyIntroDownloadMessage": "To download and install Emby Server visit {0}.", + "EmbyIntroDownloadMessageWithoutLink": "To download and install Emby Server visit the Emby website.", "ButtonNewServer": "New Server", "ButtonSignInWithConnect": "Sign in with Emby Connect", "MyDevice": "My Device",