From 7ef1e285fd7464c8e1487e02f29628b28a39c498 Mon Sep 17 00:00:00 2001
From: dfransway <dfransway+github@gmail.com>
Date: Thu, 22 Jan 2015 08:48:06 -0800
Subject: [PATCH] Explicitly setting the name should override this special
 case.

---
 src/_h5ai/client/js/inc/ext/download.js | 4 ++--
 src/_h5ai/conf/options.json             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js
index 0b1aa56e..dedc95f3 100644
--- a/src/_h5ai/client/js/inc/ext/download.js
+++ b/src/_h5ai/client/js/inc/ext/download.js
@@ -34,12 +34,12 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co
         if (selectedItems.length === 1) {
             name = selectedItems[0].label;
         } else {
-            name = settings.packageName || location.getItem().label;
+            name = location.getItem().label;
         }
 
         var query = {
                 action: 'download',
-                as: name + '.' + extension,
+                as: (settings.packageName || name) + '.' + extension,
                 type: type,
                 hrefs: _.pluck(selectedItems, 'absHref').join('|:|')
             };
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index a6ce5058..febd0a69 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -84,7 +84,7 @@ Options
     To select files the "select"-extension needs to be enabled.
 
     - type: "php-tar", "shell-tar" or "shell-zip"
-    - packageName: basename of the download package, null for current foldername
+    - packageName: basename of the download package, null for current filename or foldername
     - alwaysVisible: always show download button (defaults to download the current folder)
     */
     "download": {