diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 61838888e4..9ca9b10598 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -23,6 +23,8 @@ - [thornbill](https://github.com/thornbill) - [redSpoutnik](https://github.com/redSpoutnik) - [DrPandemic](https://github.com/drpandemic) + - [Oddstr13](https://github.com/oddstr13) + - [petermcneil](https://github.com/petermcneil) # Emby Contributors diff --git a/src/bower_components/apiclient/credentialprovider.js b/src/bower_components/apiclient/credentialprovider.js index a200b60124..471f2b5ef1 100644 --- a/src/bower_components/apiclient/credentialprovider.js +++ b/src/bower_components/apiclient/credentialprovider.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) diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js index 3a1ae99506..2abf7e2c9e 100644 --- a/src/components/channelmapper/channelmapper.js +++ b/src/components/channelmapper/channelmapper.js @@ -28,15 +28,18 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee function onChannelsElementClick(e) { var 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() - } - }); + 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, + 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 +}); 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) : diff --git a/src/manifest.json b/src/manifest.json index a438ba9ccd..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", @@ -28,8 +28,5 @@ "src": "touchicon512.png", "type": "image/png" } - ], - "related_applications": [{ - "platform": "web" - }] + ] }