From 6f2609a65a014ca0a5e21c5ba05bcb1f7b087107 Mon Sep 17 00:00:00 2001 From: bugfixin Date: Tue, 21 May 2019 18:50:38 +0000 Subject: [PATCH 1/7] Remove invalid related application stub in manifest --- src/manifest.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index a438ba9ccd..55cd35acc4 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -28,8 +28,5 @@ "src": "touchicon512.png", "type": "image/png" } - ], - "related_applications": [{ - "platform": "web" - }] + ] } From 8adcdf582890731d7052102aa2155d10d34ce2de Mon Sep 17 00:00:00 2001 From: bugfixin Date: Tue, 21 May 2019 18:52:17 +0000 Subject: [PATCH 2/7] Set start url to true home url to prevent redirect on every load --- src/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifest.json b/src/manifest.json index 55cd35acc4..289c05699c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -4,7 +4,7 @@ "description": "Jellyfin: the Free Software Media System.", "lang": "en-US", "short_name": "Jellyfin", - "start_url": "/web/index.html", + "start_url": "/web/index.html#!/home.html", "theme_color": "#101010", "background_color": "#101010", "display": "standalone", From 773fcc12639e44c28348fb62e1b6027ba32a1b82 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Fri, 24 May 2019 19:30:24 +0200 Subject: [PATCH 3/7] Fix context in querySelector --- src/components/recordingcreator/recordingfields.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js index a17054cc01..106fec36bf 100644 --- a/src/components/recordingcreator/recordingfields.js +++ b/src/components/recordingcreator/recordingfields.js @@ -194,7 +194,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active'); if (isChecked) { - context.querySelector('.recordSeriesContainer').classList.remove('hide'); + options.parent.querySelector('.recordSeriesContainer').classList.remove('hide'); if (!this.SeriesTimerId) { var promise = this.TimerId ? recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) : From e220ea603d22f4c8b3526dd7aa0ed8982e834b89 Mon Sep 17 00:00:00 2001 From: DrPandemic Date: Mon, 22 Apr 2019 01:04:02 -0400 Subject: [PATCH 4/7] Prevent the rendering of button inside button --- src/components/cardbuilder/cardbuilder.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/components/cardbuilder/cardbuilder.js b/src/components/cardbuilder/cardbuilder.js index 2885d7f75d..5878d89394 100644 --- a/src/components/cardbuilder/cardbuilder.js +++ b/src/components/cardbuilder/cardbuilder.js @@ -1267,13 +1267,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana var showTitle = options.showTitle === 'auto' ? true : (options.showTitle || item.Type === 'PhotoAlbum' || item.Type === 'Folder'); var overlayText = options.overlayText; - if (forceName && !options.cardLayout) { - - if (overlayText == null) { - overlayText = true; - } - } - var cardImageContainerClass = 'cardImageContainer'; var coveredImage = options.coverImage || imgInfo.coverImage; From 1c34f6202e728cb6a7bd51b676a70060fe191baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Fri, 14 Jun 2019 01:27:19 +0200 Subject: [PATCH 5/7] Allow Jellyfin and Emby to coexist on the same domain --- CONTRIBUTORS.md | 1 + src/bower_components/apiclient/credentials.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1fe5f517ab..f9240c1a4c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,6 +21,7 @@ - [RazeLighter777](https://github.com/RazeLighter777) - [LogicalPhallacy](https://github.com/LogicalPhallacy) - [thornbill](https://github.com/thornbill) + - [Oddstr13](https://github.com/oddstr13) # Emby Contributors diff --git a/src/bower_components/apiclient/credentials.js b/src/bower_components/apiclient/credentials.js index a200b60124..471f2b5ef1 100644 --- a/src/bower_components/apiclient/credentials.js +++ b/src/bower_components/apiclient/credentials.js @@ -13,7 +13,7 @@ define(["events", "appStorage"], function(events, appStorage) { } function Credentials(key) { - this.key = key || "servercredentials3" + this.key = key || "jellyfin_credentials" } return Credentials.prototype.clear = function() { this._credentials = null, appStorage.removeItem(this.key) From d7180c21ca1640e12e8806860419a5dc2ba238be Mon Sep 17 00:00:00 2001 From: petermcneil Date: Sun, 23 Jun 2019 16:54:13 +0100 Subject: [PATCH 6/7] Change channel mapper to sort list --- CONTRIBUTORS.md | 1 + src/components/channelmapper/channelmapper.js | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f9240c1a4c..ba574b0539 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -22,6 +22,7 @@ - [LogicalPhallacy](https://github.com/LogicalPhallacy) - [thornbill](https://github.com/thornbill) - [Oddstr13](https://github.com/oddstr13) + - [petermcneil](https://github.com/petermcneil) # Emby Contributors diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index 3a1ae99506..46ce8602af 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -26,17 +26,20 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee } function onChannelsElementClick(e) { - var btnMap = parentWithClass(e.target, "btnMap"); + const btnMap = parentWithClass(e.target, "btnMap"); if (btnMap) { - var channelId = btnMap.getAttribute("data-id"), - providerChannelId = btnMap.getAttribute("data-providerid"), - menuItems = currentMappingOptions.ProviderChannels.map(function(m) { - return { - name: m.Name, - id: m.Id, - selected: m.Id.toLowerCase() === providerChannelId.toLowerCase() - } - }); + const channelId = btnMap.getAttribute("data-id"); + const providerChannelId = btnMap.getAttribute("data-providerid"); + const menuItems = currentMappingOptions.ProviderChannels.map(function(m) { + return { + name: m.Name, + id: m.Id, + selected: m.Id.toLowerCase() === providerChannelId.toLowerCase() + } + }).sort(function (a, b) { + return a.name.localeCompare(b.name); + }); + actionsheet.show({ positionTo: btnMap, items: menuItems @@ -93,4 +96,4 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee }) } } -}); \ No newline at end of file +}); From f7376f5d9077d94c08b97e9ce02aee68cc3e3ead Mon Sep 17 00:00:00 2001 From: petermcneil Date: Sun, 23 Jun 2019 16:56:04 +0100 Subject: [PATCH 7/7] ES5 not ES6 --- src/components/channelmapper/channelmapper.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index 46ce8602af..2abf7e2c9e 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -26,11 +26,11 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee } function onChannelsElementClick(e) { - const btnMap = parentWithClass(e.target, "btnMap"); + var btnMap = parentWithClass(e.target, "btnMap"); if (btnMap) { - const channelId = btnMap.getAttribute("data-id"); - const providerChannelId = btnMap.getAttribute("data-providerid"); - const menuItems = currentMappingOptions.ProviderChannels.map(function(m) { + var channelId = btnMap.getAttribute("data-id"); + var providerChannelId = btnMap.getAttribute("data-providerid"); + var menuItems = currentMappingOptions.ProviderChannels.map(function(m) { return { name: m.Name, id: m.Id,