diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index bf0f7aceb6..e2cd502707 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -463,7 +463,7 @@ body:not(.dashboardDocument) .btnNotifications { } .adminDrawerLogo { - padding: 15px 1em; + padding: 1.5em 1em 1.2em; border-bottom: 1px solid #e0e0e0; margin-bottom: 1em; display: block; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index da425e86ae..3971f5271e 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -981,10 +981,17 @@ break; case 'download': { - var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { - api_key: ApiClient.accessToken() + require(['fileDownloader'], function (fileDownloader) { + + var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { + api_key: ApiClient.accessToken() + }); + + fileDownloader([{ + url: downloadHref, + itemId: itemId + }]); }); - window.location.href = downloadHref; break; } diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 00b3959725..52a6c1c0de 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -479,7 +479,6 @@ case 'download': { require(['fileDownloader'], function (fileDownloader) { - var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { api_key: ApiClient.accessToken() }); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 757f06c389..85de426c5d 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -469,7 +469,7 @@ //html += ''; //html += ''; - html += '' diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index fd2850c5c6..67adefd13f 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2120,9 +2120,9 @@ var AppInfo = {}; } if (Dashboard.isRunningInCordova() && browser.android) { - define("fileDownloader", 'components/filedownloader', returnFirstDependency); + define("fileDownloader", ['cordova/android/filedownloader'], returnFirstDependency); } else { - define("fileDownloader", 'cordova/android/filedownloader', returnFirstDependency); + define("fileDownloader", ['components/filedownloader'], returnFirstDependency); } }