Merge pull request #1166 from sarab97/downloadbutton

Download button fix on photos slideshow

CONTRIBUTORS.md

@@ -34,6 +34,7 @@
  - [Ryan Hartzell](https://github.com/ryan-hartzell)
  - [Thibault Nocchi](https://github.com/ThibaultNocchi)
  - [MrTimscampi](https://github.com/MrTimscampi)
+ - [Sarab Singh](https://github.com/sarab97)
 
 # Emby Contributors
 

src/components/photoplayer/plugin.js

@@ -21,18 +21,24 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
 
                 var index = options.startIndex || 0;
 
-                var newSlideShow = new slideshow({
+                var apiClient = connectionManager.currentApiClient();
-                    showTitle: false,
+
-                    cover: false,
+                apiClient.getCurrentUser().then(function(result) {
-                    items: options.items,
+
-                    startIndex: index,
+                    var newSlideShow = new slideshow({
-                    interval: 11000,
+                        showTitle: false,
-                    interactive: true
+                        cover: false,
+                        items: options.items,
+                        startIndex: index,
+                        interval: 11000,
+                        interactive: true,
+                        user: result
+                    });
+
+                    newSlideShow.show();
+
+                    resolve();
                 });
-
-                newSlideShow.show();
-
-                resolve();
             });
         });
     };

src/components/slideshow/slideshow.js

@@ -66,14 +66,14 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
      * @param {object} item - Item used to generate the image URL.
      * @returns {string} URL of the item's image.
      */
-    function getImgUrl(item) {
+    function getImgUrl(item, user) {
         var apiClient = connectionManager.getApiClient(item.ServerId);
         var imageOptions = {};
 
         if (item.BackdropImageTags && item.BackdropImageTags.length) {
             return getBackdropImageUrl(item, imageOptions, apiClient);
         } else {
-            if (item.MediaType === 'Photo') {
+            if (item.MediaType === 'Photo' && user && user.Policy.EnableContentDownloading) {
                 return apiClient.getItemDownloadUrl(item.Id);
             }
             imageOptions.type = "Primary";
@@ -155,7 +155,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
                 html += '<div class="topActionButtons">';
                 if (actionButtonsOnTop) {
-                    if (appHost.supports('filedownload')) {
+                    if (appHost.supports('filedownload') && options.user && options.user.Policy.EnableContentDownloading) {
                         html += getIcon('file_download', 'btnDownload slideshowButton', true);
                     }
                     if (appHost.supports('sharing')) {
@@ -169,7 +169,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
                     html += '<div class="slideshowBottomBar hide">';
 
                     html += getIcon('play_arrow', 'btnSlideshowPause slideshowButton', true, true);
-                    if (appHost.supports('filedownload')) {
+                    if (appHost.supports('filedownload') && options.user && options.user.Policy.EnableContentDownloading) {
                         html += getIcon('file_download', 'btnDownload slideshowButton', true);
                     }
                     if (appHost.supports('sharing')) {
@@ -312,7 +312,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
          */
         function getSwiperSlideHtmlFromItem(item) {
             return getSwiperSlideHtmlFromSlide({
-                originalImage: getImgUrl(item),
+                originalImage: getImgUrl(item, currentOptions.user),
                 //title: item.Name,
                 //description: item.Overview
                 Id: item.Id,