Merge branch 'master' into return-of-the-scrollbar

2020-11-20 09:28:55 +03:00
parent 517b69550e 35fa5a2873
commit c2b1d02a33
321 changed files with 7572 additions and 6563 deletions
@@ -1,4 +1,5 @@
 /* eslint-disable indent */
+import ServerConnections from '../../components/ServerConnections';

 class BackdropScreensaver {
    constructor() {
@@ -20,10 +21,10 @@ class BackdropScreensaver {
                Limit: 200
            };

-            const apiClient = window.connectionManager.currentApiClient();
+            const apiClient = ServerConnections.currentApiClient();
            apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
                if (result.Items.length) {
-                    import('slideshow').then(({default: Slideshow}) => {
+                    import('../../components/slideshow/slideshow').then(({default: Slideshow}) => {
                        const newSlideShow = new Slideshow({
                            showTitle: true,
                            cover: true,