From ca36b180948db451d51715f071d6dbad931bb0be Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 9 Oct 2016 00:58:57 -0400 Subject: [PATCH] update shared components --- .../emby-webcomponents/.bower.json | 8 +++---- .../cardbuilder/cardbuilder.js | 2 +- .../emby-slider/emby-slider.js | 21 +++++++++++++------ .../emby-webcomponents/guide/guide.js | 2 +- .../indicators/indicators.js | 2 +- .../emby-webcomponents/itemhelper.js | 3 ++- .../emby-webcomponents/mediainfo/mediainfo.js | 2 +- .../playlisteditor/playlisteditor.js | 7 +++---- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 69ac1a742..69a21bdbe 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.290", - "_release": "1.4.290", + "version": "1.4.292", + "_release": "1.4.292", "_resolution": { "type": "version", - "tag": "1.4.290", - "commit": "f15ea365d1ca29361d3d3ac1348fc6fdbf7773e3" + "tag": "1.4.292", + "commit": "42bd91dd686bbe14a0126e620d0fececb757516b" }, "_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 5426cb4e9..46bd99a21 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -109,7 +109,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (screenWidth >= 2500) { return 6; } - if (screenWidth >= 2100) { + if (screenWidth >= 1600) { return 5; } if (screenWidth >= 1200) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js index da6ed55d8..1c222c1c9 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js @@ -29,9 +29,8 @@ }); } - function updateBubble(range, bubble) { + function updateBubble(range, value, bubble) { - var value = range.value; bubble.style.left = (value - 1) + '%'; if (range.getBubbleText) { @@ -72,16 +71,26 @@ this.addEventListener('input', function (e) { this.dragging = true; - updateBubble(this, sliderBubble); + }); + this.addEventListener('change', function () { + this.dragging = false; + updateValues(this, backgroundLower, backgroundUpper); + }); + + this.addEventListener('mousemove', function (e) { + + var rect = this.getBoundingClientRect(); + var clientX = e.clientX; + var bubbleValue = (clientX - rect.left) / rect.width; + bubbleValue *= 100; + updateBubble(this, Math.round(bubbleValue), sliderBubble); if (hasHideClass) { sliderBubble.classList.remove('hide'); hasHideClass = false; } }); - this.addEventListener('change', function () { - this.dragging = false; - updateValues(this, backgroundLower, backgroundUpper); + this.addEventListener('mouseleave', function () { sliderBubble.classList.add('hide'); hasHideClass = true; }); diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js index 26cc3237f..81ac16596 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js @@ -367,7 +367,7 @@ if (item.SeriesTimerId) { - if (status != 'Cancelled' && status != 'Aborted') { + if (status != 'Cancelled') { return ''; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/indicators/indicators.js b/dashboard-ui/bower_components/emby-webcomponents/indicators/indicators.js index b2d19311b..c126f3dba 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/indicators/indicators.js +++ b/dashboard-ui/bower_components/emby-webcomponents/indicators/indicators.js @@ -117,7 +117,7 @@ define(['css!./indicators.css', 'material-icons'], function () { if (item.SeriesTimerId) { - if (status != 'Cancelled' && status != 'Aborted') { + if (status != 'Cancelled') { return ''; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemhelper.js b/dashboard-ui/bower_components/emby-webcomponents/itemhelper.js index aa0cb7124..489fa3f8d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemhelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemhelper.js @@ -60,6 +60,7 @@ define(['apphost'], function (appHost) { } function supportsAddingToPlaylist(item) { + if (item.Type == 'Program') { return false; } @@ -69,7 +70,7 @@ define(['apphost'], function (appHost) { if (item.Type == 'SeriesTimer') { return false; } - return item.RunTimeTicks || item.IsFolder || item.Type == "Genre" || item.Type == "MusicGenre" || item.Type == "MusicArtist"; + return item.MediaType || item.IsFolder || item.Type == "Genre" || item.Type == "MusicGenre" || item.Type == "MusicArtist"; } function canEdit(user, itemType) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js b/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js index 192c9f943..7bdda755e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js +++ b/dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js @@ -21,7 +21,7 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', ' if (item.SeriesTimerId) { - if (status != 'Cancelled' && status != 'Aborted') { + if (status != 'Cancelled') { return ''; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js index 41d1f0502..d120f4c54 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js @@ -1,6 +1,5 @@ -define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, connectionManager, embyRouter, globalize) { +define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'userSettings', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, connectionManager, userSettings, embyRouter, globalize) { - var lastPlaylistId = ''; var currentServerId; function parentWithClass(elem, className) { @@ -26,7 +25,7 @@ var apiClient = connectionManager.getApiClient(currentServerId); if (playlistId) { - lastPlaylistId = playlistId; + userSettings.set('playlisteditor-lastplaylistid', playlistId); addToPlaylist(apiClient, panel, playlistId); } else { createPlaylist(apiClient, panel); @@ -126,7 +125,7 @@ }); select.innerHTML = html; - select.value = lastPlaylistId || ''; + select.value = userSettings.get('playlisteditor-lastplaylistid') || ''; triggerChange(select); loading.hide();