Merge branch 'master' into hadicharara/added-support-for-rtl-layouts

src/controllers/dashboard/general.js

@@ -15,7 +15,6 @@ import alert from '../../components/alert';
         page.querySelector('#txtServerName').value = systemInfo.ServerName;
         page.querySelector('#txtCachePath').value = systemInfo.CachePath || '';
         page.querySelector('#chkQuickConnectAvailable').checked = config.QuickConnectAvailable === true;
-        page.querySelector('#chkSplashScreenAvailable').checked = config.SplashscreenEnabled === true;
         $('#txtMetadataPath', page).val(systemInfo.InternalMetadataPath || '');
         $('#txtMetadataNetworkPath', page).val(systemInfo.MetadataNetworkPath || '');
         $('#selectLocalizationLanguage', page).html(languageOptions.map(function (language) {
@@ -108,6 +107,7 @@ import alert from '../../components/alert';
             ApiClient.getNamedConfiguration(brandingConfigKey).then(function (config) {
                 view.querySelector('#txtLoginDisclaimer').value = config.LoginDisclaimer || '';
                 view.querySelector('#txtCustomCss').value = config.CustomCss || '';
+                view.querySelector('#chkSplashScreenAvailable').checked = config.SplashscreenEnabled === true;
             });
         });
     }

src/controllers/dashboard/logs.js

@@ -9,7 +9,8 @@ import alert from '../../components/alert';
 
 /* eslint-disable indent */
 
-    function onSubmit() {
+    function onSubmit(event) {
+        event.preventDefault();
         loading.show();
         const form = this;
         ApiClient.getServerConfiguration().then(function (config) {

src/controllers/dashboard/users/useredit.html

@@ -1,3 +0,0 @@
-<div id="editUserPage" data-role="page" class="page type-interior">
-
-</div>

src/controllers/dashboard/users/userlibraryaccess.html

@@ -1,3 +0,0 @@
-<div id="userLibraryAccessPage" data-role="page" class="page type-interior">
-
-</div>

src/controllers/dashboard/users/usernew.html

@@ -1,3 +0,0 @@
-<div id="newUserPage" data-role="page" class="page type-interior">
-
-</div>

src/controllers/dashboard/users/userparentalcontrol.html

@@ -1,3 +0,0 @@
-<div id="userParentalControlPage" data-role="page" class="page type-interior">
-
-</div>

src/controllers/dashboard/users/userpassword.html

@@ -1,3 +0,0 @@
-<div id="userPasswordPage" data-role="page" class="page type-interior userPasswordPage">
-
-</div>

src/controllers/dashboard/users/userprofiles.html

@@ -1,3 +0,0 @@
-<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage fullWidthContent">
-
-</div>

src/controllers/home.html

@@ -1,9 +0,0 @@
-<div id="indexPage" style="outline: none;" data-role="page" data-dom-cache="true" class="page homePage libraryPage allLibraryPage backdropPage pageWithAbsoluteTabs withTabs" data-backdroptype="movie,series,book">
-
-    <div class="tabContent pageTabContent" id="homeTab" data-index="0">
-        <div class="sections"></div>
-    </div>
-    <div class="tabContent pageTabContent" id="favoritesTab" data-index="1">
-        <div class="sections"></div>
-    </div>
-</div>

src/controllers/home.js

@@ -1,69 +0,0 @@
-import TabbedView from '../components/tabbedview/tabbedview';
-import globalize from '../scripts/globalize';
-import '../elements/emby-tabs/emby-tabs';
-import '../elements/emby-button/emby-button';
-import '../elements/emby-scroller/emby-scroller';
-import LibraryMenu from '../scripts/libraryMenu';
-
-class HomeView extends TabbedView {
-    constructor(view, params) {
-        super(view, params);
-    }
-
-    setTitle() {
-        LibraryMenu.setTitle(null);
-    }
-
-    onPause() {
-        super.onPause(this);
-        document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
-    }
-
-    onResume(options) {
-        super.onResume(this, options);
-        document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
-    }
-
-    getDefaultTabIndex() {
-        return 0;
-    }
-
-    getTabs() {
-        return [{
-            name: globalize.translate('Home')
-        }, {
-            name: globalize.translate('Favorites')
-        }];
-    }
-
-    getTabController(index) {
-        if (index == null) {
-            throw new Error('index cannot be null');
-        }
-
-        let depends = '';
-
-        switch (index) {
-            case 0:
-                depends = 'hometab';
-                break;
-
-            case 1:
-                depends = 'favorites';
-        }
-
-        const instance = this;
-        return import(/* webpackChunkName: "[request]" */ `../controllers/${depends}`).then(({ default: controllerFactory }) => {
-            let controller = instance.tabControllers[index];
-
-            if (!controller) {
-                controller = new controllerFactory(instance.view.querySelector(".tabContent[data-index='" + index + "']"), instance.params);
-                instance.tabControllers[index] = controller;
-            }
-
-            return controller;
-        });
-    }
-}
-
-export default HomeView;

src/controllers/itemDetails/index.js

@@ -1985,7 +1985,9 @@ export default function (view, params) {
         download([{
             url: downloadHref,
             itemId: currentItem.Id,
-            serverId: currentItem.serverId
+            serverId: currentItem.ServerId,
+            title: currentItem.Name,
+            filename: currentItem.Path.replace(/^.*[\\/]/, '')
         }]);
     }
 

src/controllers/livetvtuner.html

@@ -62,6 +62,14 @@
                     <div class="fieldDescription checkboxFieldDescription">${EnableStreamLoopingHelp}</div>
                 </div>
 
+                <div class="checkboxContainer checkboxContainer-withDescription fldIgnoreDts hide">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkIgnoreDts" checked />
+                        <span>${IgnoreDts}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${IgnoreDtsHelp}</div>
+                </div>
+
                 <p class="drmMessage hide">${DrmChannelsNotImported}</p>
                 <br />
                 <input type="hidden" class="fldDeviceId" />

src/controllers/livetvtuner.js

@@ -61,6 +61,7 @@ function fillTunerHostInfo(view, info) {
     view.querySelector('.chkFavorite').checked = info.ImportFavoritesOnly;
     view.querySelector('.chkTranscode').checked = info.AllowHWTranscoding;
     view.querySelector('.chkStreamLoop').checked = info.EnableStreamLooping;
+    view.querySelector('.chkIgnoreDts').checked = info.IgnoreDts;
     view.querySelector('.txtTunerCount').value = info.TunerCount || '0';
 }
 
@@ -75,7 +76,8 @@ function submitForm(page) {
         TunerCount: page.querySelector('.txtTunerCount').value || 0,
         ImportFavoritesOnly: page.querySelector('.chkFavorite').checked,
         AllowHWTranscoding: page.querySelector('.chkTranscode').checked,
-        EnableStreamLooping: page.querySelector('.chkStreamLoop').checked
+        EnableStreamLooping: page.querySelector('.chkStreamLoop').checked,
+        IgnoreDts: page.querySelector('.chkIgnoreDts').checked
     };
 
     if (isM3uVariant(info.Type)) {
@@ -120,6 +122,7 @@ function onTypeChange() {
     const supportsTunerIpAddress = value === 'hdhomerun';
     const supportsTunerFileOrUrl = value === 'm3u';
     const supportsStreamLooping = value === 'm3u';
+    const supportsIgnoreDts = value === 'm3u';
     const supportsTunerCount = value === 'm3u';
     const supportsUserAgent = value === 'm3u';
     const suppportsSubmit = value !== 'other';
@@ -168,6 +171,12 @@ function onTypeChange() {
         view.querySelector('.fldStreamLoop').classList.add('hide');
     }
 
+    if (supportsIgnoreDts) {
+        view.querySelector('.fldIgnoreDts').classList.remove('hide');
+    } else {
+        view.querySelector('.fldIgnoreDts').classList.add('hide');
+    }
+
     if (supportsTunerCount) {
         view.querySelector('.fldTunerCount').classList.remove('hide');
         view.querySelector('.txtTunerCount').setAttribute('required', 'required');

src/controllers/music/music.html

@@ -92,6 +92,7 @@
     <div class="pageTabContent" id="songsTab" data-index="5">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
+            <button is="paper-icon-button-light" class="btnShuffle autoSize" title="${Shuffle}"><span class="material-icons shuffle" aria-hidden="true"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
             <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>

src/controllers/music/songs.js

@@ -8,197 +8,207 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../scripts/globalize';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import Dashboard from '../../utils/dashboard';
+import {playbackManager} from '../../components/playback/playbackmanager';
 
-/* eslint-disable indent */
+export default function (view, params, tabContent) {
+    function getPageData(context) {
+        const key = getSavedQueryKey(context);
+        let pageData = data[key];
 
-    export default function (view, params, tabContent) {
-        function getPageData(context) {
-            const key = getSavedQueryKey(context);
-            let pageData = data[key];
-
-            if (!pageData) {
-                pageData = data[key] = {
-                    query: {
-                        SortBy: 'Album,SortName',
-                        SortOrder: 'Ascending',
-                        IncludeItemTypes: 'Audio',
-                        Recursive: true,
-                        Fields: 'AudioInfo,ParentId',
-                        StartIndex: 0,
-                        ImageTypeLimit: 1,
-                        EnableImageTypes: 'Primary'
-                    }
-                };
-
-                if (userSettings.libraryPageSize() > 0) {
-                    pageData.query['Limit'] = userSettings.libraryPageSize();
+        if (!pageData) {
+            pageData = data[key] = {
+                query: {
+                    SortBy: 'Album,SortName',
+                    SortOrder: 'Ascending',
+                    IncludeItemTypes: 'Audio',
+                    Recursive: true,
+                    Fields: 'AudioInfo,ParentId',
+                    StartIndex: 0,
+                    ImageTypeLimit: 1,
+                    EnableImageTypes: 'Primary'
                 }
+            };
 
-                pageData.query.ParentId = params.topParentId;
-                libraryBrowser.loadSavedQueryValues(key, pageData.query);
+            if (userSettings.libraryPageSize() > 0) {
+                pageData.query['Limit'] = userSettings.libraryPageSize();
             }
 
-            return pageData;
+            pageData.query.ParentId = params.topParentId;
+            libraryBrowser.loadSavedQueryValues(key, pageData.query);
         }
 
-        function getQuery(context) {
-            return getPageData(context).query;
-        }
-
-        function getSavedQueryKey(context) {
-            if (!context.savedQueryKey) {
-                context.savedQueryKey = libraryBrowser.getSavedQueryKey('songs');
-            }
-
-            return context.savedQueryKey;
-        }
-
-        function reloadItems(page) {
-            loading.show();
-            isLoading = true;
-            const query = getQuery(page);
-            ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
-                function onNextPageClick() {
-                    if (isLoading) {
-                        return;
-                    }
-
-                    if (userSettings.libraryPageSize() > 0) {
-                        query.StartIndex += query.Limit;
-                    }
-                    reloadItems(tabContent);
-                }
-
-                function onPreviousPageClick() {
-                    if (isLoading) {
-                        return;
-                    }
-
-                    if (userSettings.libraryPageSize() > 0) {
-                        query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
-                    }
-                    reloadItems(tabContent);
-                }
-
-                window.scrollTo(0, 0);
-                const pagingHtml = libraryBrowser.getQueryPagingHtml({
-                    startIndex: query.StartIndex,
-                    limit: query.Limit,
-                    totalRecordCount: result.TotalRecordCount,
-                    showLimit: false,
-                    updatePageSizeSetting: false,
-                    addLayoutButton: false,
-                    sortButton: false,
-                    filterButton: false
-                });
-                const html = listView.getListViewHtml({
-                    items: result.Items,
-                    action: 'playallfromhere',
-                    smallIcon: true,
-                    artist: true,
-                    addToListButton: true
-                });
-                let elems = tabContent.querySelectorAll('.paging');
-
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].innerHTML = pagingHtml;
-                }
-
-                elems = tabContent.querySelectorAll('.btnNextPage');
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('click', onNextPageClick);
-                }
-
-                elems = tabContent.querySelectorAll('.btnPreviousPage');
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('click', onPreviousPageClick);
-                }
-
-                const itemsContainer = tabContent.querySelector('.itemsContainer');
-                itemsContainer.innerHTML = html;
-                imageLoader.lazyChildren(itemsContainer);
-                libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
-                loading.hide();
-                isLoading = false;
-
-                import('../../components/autoFocuser').then(({default: autoFocuser}) => {
-                    autoFocuser.autoFocus(page);
-                });
-            });
-        }
-
-        const self = this;
-        const data = {};
-        let isLoading = false;
-
-        self.showFilterMenu = function () {
-            import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
-                const filterDialog = new filterDialogFactory({
-                    query: getQuery(tabContent),
-                    mode: 'songs',
-                    serverId: ApiClient.serverId()
-                });
-                Events.on(filterDialog, 'filterchange', function () {
-                    getQuery(tabContent).StartIndex = 0;
-                    reloadItems(tabContent);
-                });
-                filterDialog.show();
-            });
-        };
-
-        self.getCurrentViewStyle = function () {
-            return getPageData(tabContent).view;
-        };
-
-        function initPage(tabContent) {
-            tabContent.querySelector('.btnFilter').addEventListener('click', function () {
-                self.showFilterMenu();
-            });
-            tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
-                libraryBrowser.showSortMenu({
-                    items: [{
-                        name: globalize.translate('OptionTrackName'),
-                        id: 'Name'
-                    }, {
-                        name: globalize.translate('Album'),
-                        id: 'Album,SortName'
-                    }, {
-                        name: globalize.translate('AlbumArtist'),
-                        id: 'AlbumArtist,Album,SortName'
-                    }, {
-                        name: globalize.translate('Artist'),
-                        id: 'Artist,Album,SortName'
-                    }, {
-                        name: globalize.translate('OptionDateAdded'),
-                        id: 'DateCreated,SortName'
-                    }, {
-                        name: globalize.translate('OptionDatePlayed'),
-                        id: 'DatePlayed,SortName'
-                    }, {
-                        name: globalize.translate('OptionPlayCount'),
-                        id: 'PlayCount,SortName'
-                    }, {
-                        name: globalize.translate('OptionReleaseDate'),
-                        id: 'PremiereDate,AlbumArtist,Album,SortName'
-                    }, {
-                        name: globalize.translate('Runtime'),
-                        id: 'Runtime,AlbumArtist,Album,SortName'
-                    }],
-                    callback: function () {
-                        getQuery(tabContent).StartIndex = 0;
-                        reloadItems(tabContent);
-                    },
-                    query: getQuery(tabContent),
-                    button: e.target
-                });
-            });
-        }
-
-        initPage(tabContent);
-
-        self.renderTab = function () {
-            reloadItems(tabContent);
-        };
+        return pageData;
     }
 
-/* eslint-enable indent */
+    function getQuery(context) {
+        return getPageData(context).query;
+    }
+
+    function getSavedQueryKey(context) {
+        if (!context.savedQueryKey) {
+            context.savedQueryKey = libraryBrowser.getSavedQueryKey('songs');
+        }
+
+        return context.savedQueryKey;
+    }
+
+    function reloadItems(page) {
+        loading.show();
+        isLoading = true;
+        const query = getQuery(page);
+        ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
+            function onNextPageClick() {
+                if (isLoading) {
+                    return;
+                }
+
+                if (userSettings.libraryPageSize() > 0) {
+                    query.StartIndex += query.Limit;
+                }
+                reloadItems(tabContent);
+            }
+
+            function onPreviousPageClick() {
+                if (isLoading) {
+                    return;
+                }
+
+                if (userSettings.libraryPageSize() > 0) {
+                    query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
+                }
+                reloadItems(tabContent);
+            }
+
+            window.scrollTo(0, 0);
+            const pagingHtml = libraryBrowser.getQueryPagingHtml({
+                startIndex: query.StartIndex,
+                limit: query.Limit,
+                totalRecordCount: result.TotalRecordCount,
+                showLimit: false,
+                updatePageSizeSetting: false,
+                addLayoutButton: false,
+                sortButton: false,
+                filterButton: false
+            });
+            const html = listView.getListViewHtml({
+                items: result.Items,
+                action: 'playallfromhere',
+                smallIcon: true,
+                artist: true,
+                addToListButton: true
+            });
+            let elems = tabContent.querySelectorAll('.paging');
+
+            for (let i = 0, length = elems.length; i < length; i++) {
+                elems[i].innerHTML = pagingHtml;
+            }
+
+            elems = tabContent.querySelectorAll('.btnNextPage');
+            for (let i = 0, length = elems.length; i < length; i++) {
+                elems[i].addEventListener('click', onNextPageClick);
+            }
+
+            elems = tabContent.querySelectorAll('.btnPreviousPage');
+            for (let i = 0, length = elems.length; i < length; i++) {
+                elems[i].addEventListener('click', onPreviousPageClick);
+            }
+
+            const itemsContainer = tabContent.querySelector('.itemsContainer');
+            itemsContainer.innerHTML = html;
+            imageLoader.lazyChildren(itemsContainer);
+            libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
+
+            tabContent.querySelector('.btnShuffle').classList.toggle('hide', result.TotalRecordCount < 1);
+
+            loading.hide();
+            isLoading = false;
+
+            import('../../components/autoFocuser').then(({default: autoFocuser}) => {
+                autoFocuser.autoFocus(page);
+            });
+        });
+    }
+
+    const self = this;
+    const data = {};
+    let isLoading = false;
+
+    self.showFilterMenu = function () {
+        import('../../components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+            const filterDialog = new filterDialogFactory({
+                query: getQuery(tabContent),
+                mode: 'songs',
+                serverId: ApiClient.serverId()
+            });
+            Events.on(filterDialog, 'filterchange', function () {
+                getQuery(tabContent).StartIndex = 0;
+                reloadItems(tabContent);
+            });
+            filterDialog.show();
+        });
+    };
+
+    function shuffle() {
+        ApiClient.getItem(ApiClient.getCurrentUserId(), params.topParentId).then(function (item) {
+            playbackManager.shuffle(item);
+        });
+    }
+
+    self.getCurrentViewStyle = function () {
+        return getPageData(tabContent).view;
+    };
+
+    function initPage(tabContent) {
+        tabContent.querySelector('.btnFilter').addEventListener('click', function () {
+            self.showFilterMenu();
+        });
+        tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
+            libraryBrowser.showSortMenu({
+                items: [{
+                    name: globalize.translate('OptionTrackName'),
+                    id: 'Name'
+                }, {
+                    name: globalize.translate('Album'),
+                    id: 'Album,SortName'
+                }, {
+                    name: globalize.translate('AlbumArtist'),
+                    id: 'AlbumArtist,Album,SortName'
+                }, {
+                    name: globalize.translate('Artist'),
+                    id: 'Artist,Album,SortName'
+                }, {
+                    name: globalize.translate('OptionDateAdded'),
+                    id: 'DateCreated,SortName'
+                }, {
+                    name: globalize.translate('OptionDatePlayed'),
+                    id: 'DatePlayed,SortName'
+                }, {
+                    name: globalize.translate('OptionPlayCount'),
+                    id: 'PlayCount,SortName'
+                }, {
+                    name: globalize.translate('OptionReleaseDate'),
+                    id: 'PremiereDate,AlbumArtist,Album,SortName'
+                }, {
+                    name: globalize.translate('Runtime'),
+                    id: 'Runtime,AlbumArtist,Album,SortName'
+                }, {
+                    name: globalize.translate('OptionRandom'),
+                    id: 'Random,SortName'
+                }],
+                callback: function () {
+                    getQuery(tabContent).StartIndex = 0;
+                    reloadItems(tabContent);
+                },
+                query: getQuery(tabContent),
+                button: e.target
+            });
+        });
+        tabContent.querySelector('.btnShuffle').addEventListener('click', shuffle);
+    }
+
+    initPage(tabContent);
+
+    self.renderTab = function () {
+        reloadItems(tabContent);
+    };
+}

src/controllers/shows/tvshows.js

@@ -259,8 +259,11 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
                         name: globalize.translate('OptionImdbRating'),
                         id: 'CommunityRating,SortName'
                     }, {
-                        name: globalize.translate('OptionDateAdded'),
+                        name: globalize.translate('OptionDateShowAdded'),
                         id: 'DateCreated,SortName'
+                    }, {
+                        name: globalize.translate('OptionDateEpisodeAdded'),
+                        id: 'DateLastContentAdded,SortName'
                     }, {
                         name: globalize.translate('OptionDatePlayed'),
                         id: 'SeriesDatePlayed,SortName'

src/controllers/user/menu/index.html

@@ -3,7 +3,7 @@
         <div class="readOnlyContent" style="margin: 0 auto;">
             <div class="verticalSection verticalSection-extrabottompadding">
                 <h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
-                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkMyProfile listItem-border">
+                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkUserProfile listItem-border">
                     <div class="listItem">
                         <span class="material-icons listItemIcon listItemIcon-transparent person" aria-hidden="true"></span>
                         <div class="listItemBody">

src/controllers/user/menu/index.js

@@ -26,7 +26,7 @@ export default function (view, params) {
         const userId = params.userId || Dashboard.getCurrentUserId();
         const page = this;
 
-        page.querySelector('.lnkMyProfile').setAttribute('href', '#/myprofile.html?userId=' + userId);
+        page.querySelector('.lnkUserProfile').setAttribute('href', '#/userprofile.html?userId=' + userId);
         page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay.html?userId=' + userId);
         page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId);
         page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId);

src/controllers/user/profile/index.html

@@ -1,3 +0,0 @@
-<div id="userProfilePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${Profile}" data-menubutton="false">
-
-</div>