diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index adf3f3e138..dfece1283f 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.94", - "_release": "1.1.94", + "version": "1.1.96", + "_release": "1.1.96", "_resolution": { "type": "version", - "tag": "1.1.94", - "commit": "7e52c39c2c6a43b00b845509e8b227420042ce6f" + "tag": "1.1.96", + "commit": "81f0ec7b5bca701668dd1e643d0a4381b414d771" }, "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_target": "~1.1.5", diff --git a/dashboard-ui/bower_components/emby-webcomponents/datetime.js b/dashboard-ui/bower_components/emby-webcomponents/datetime.js index 26cdb04698..022de2e9e8 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/datetime.js +++ b/dashboard-ui/bower_components/emby-webcomponents/datetime.js @@ -94,8 +94,39 @@ define([], function () { return parts.join(':'); } + function getDisplayTime(date) { + var time = date.toLocaleTimeString().toLowerCase(); + + if (time.indexOf('am') != -1 || time.indexOf('pm') != -1) { + + var hour = date.getHours() % 12; + var suffix = date.getHours() > 11 ? 'pm' : 'am'; + if (!hour) { + hour = 12; + } + var minutes = date.getMinutes(); + + if (minutes < 10) { + minutes = '0' + minutes; + } + time = hour + ':' + minutes + suffix; + } else { + + var timeParts = time.split(':'); + + // Trim off seconds + if (timeParts.length > 2) { + timeParts.length -= 1; + time = timeParts.join(':'); + } + } + + return time; + } + return { parseISO8601Date: parseISO8601Date, - getDisplayRunningTime: getDisplayRunningTime + getDisplayRunningTime: getDisplayRunningTime, + getDisplayTime: getDisplayTime }; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/requirecss.js b/dashboard-ui/bower_components/emby-webcomponents/requirecss.js index e0f2326cc8..4d93987fdb 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/requirecss.js +++ b/dashboard-ui/bower_components/emby-webcomponents/requirecss.js @@ -47,7 +47,13 @@ define(function () { link.setAttribute('rel', 'stylesheet'); link.setAttribute('type', 'text/css'); link.onload = load; - link.setAttribute('href', url + "?" + config.urlArgs); + + var linkUrl = url; + + if (config.urlArgs) { + linkUrl += config.urlArgs(cssId, url); + } + link.setAttribute('href', linkUrl); document.head.appendChild(link); } else { load(); diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index 85e8252b32..0b0736d6a6 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -29,14 +29,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-behaviors", + "homepage": "https://github.com/polymerelements/iron-behaviors", "_release": "1.0.13", "_resolution": { "type": "version", "tag": "v1.0.13", "commit": "a7bc3428a6da2beed21987b3a8028206826a12bc" }, - "_source": "git://github.com/PolymerElements/iron-behaviors.git", + "_source": "git://github.com/polymerelements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-behaviors" + "_originalSource": "polymerelements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index c6c5c62b6b..f60160480a 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -36,6 +36,6 @@ "commit": "6d88f29f3a7181daa2a5c7f678de44f0a0e6a717" }, "_source": "git://github.com/PolymerElements/iron-flex-layout.git", - "_target": "^1.0.0", + "_target": "^1.3.1", "_originalSource": "PolymerElements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index 9784e3a3b7..f0167baf13 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-icon", + "homepage": "https://github.com/polymerelements/iron-icon", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "f36b38928849ef3853db727faa8c9ef104d611eb" }, - "_source": "git://github.com/PolymerElements/iron-icon.git", + "_source": "git://github.com/polymerelements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-icon" + "_originalSource": "polymerelements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index c6b481c2cb..66d7d54b0f 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.3.0", "commit": "1662093611cda3fd29125cdab94a61d3d88093da" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 832fc31d36..a3aea261b5 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -3094,6 +3094,8 @@ var AppInfo = {}; require(deps, function (imageLoader, pageObjects) { + console.log('Loaded dependencies in onAppReady'); + imageLoader.enableFade = browserInfo.animate && !browserInfo.mobile; window.ImageLoader = imageLoader;