Merge pull request #136 from dduponchel/issue_130

Don't generate subfolders.
Stuk · May 29, 2014 · c2b5aea · c2b5aea
2 parents fc801a9 + 5c91113
commit c2b5aea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 41 deletions.
diff --git a/lib/object.js b/lib/object.js
@@ -213,11 +213,7 @@ var prepareFileAttrs = function(o) {
  */
 var fileAdd = function(name, data, o) {
     // be sure sub folders exist
-    var parent = parentFolder(name),
-        dataType = utils.getTypeOf(data);
-    if (parent) {
-        folderAdd.call(this, parent);
-    }
+    var dataType = utils.getTypeOf(data);
 
     o = prepareFileAttrs(o);
 
@@ -255,21 +251,6 @@ var fileAdd = function(name, data, o) {
     return object;
 };
 
-
-/**
- * Find the parent folder of the path.
- * @private
- * @param {string} path the path to use
- * @return {string} the parent folder, or ""
- */
-var parentFolder = function(path) {
-    if (path.slice(-1) == '/') {
-        path = path.substring(0, path.length - 1);
-    }
-    var lastSlash = path.lastIndexOf('/');
-    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
-};
-
 /**
  * Add a (sub) folder in the current folder.
  * @private
@@ -622,19 +603,16 @@ var out = {
             file = this.files[name];
         }
 
-        if (file) {
-            if (!file.options.dir) {
-                // file
-                delete this.files[name];
-            }
-            else {
-                // folder
-                var kids = this.filter(function(relativePath, file) {
-                    return file.name.slice(0, name.length) === name;
-                });
-                for (var i = 0; i < kids.length; i++) {
-                    delete this.files[kids[i].name];
-                }
+        if (file && !file.options.dir) {
+            // file
+            delete this.files[name];
+        } else {
+            // maybe a folder, delete recursively
+            var kids = this.filter(function(relativePath, file) {
+                return file.name.slice(0, name.length) === name;
+            });
+            for (var i = 0; i < kids.length; i++) {
+                delete this.files[kids[i].name];
             }
         }
 

diff --git a/test/test.js b/test/test.js
@@ -292,9 +292,9 @@ test("Finding folders", function () {
    zip.folder("root/").folder("sub1/");
    zip.folder("root/sub2/subsub1");
 
-   equal(zip.folder(/sub2\/$/).length, 1, "unique result");
+   equal(zip.folder(/sub2\/$/).length, 0, "unique result");
    equal(zip.folder(/sub1/).length, 2, "multiple results");
-   equal(zip.folder(/root/).length, 4, "match on whole path");
+   equal(zip.folder(/root/).length, 3, "match on whole path");
 });
 
 test("Finding folders with relative path", function () {
@@ -1152,25 +1152,25 @@ if (QUnit.urlParams.complexfiles) {
    // a showcase in http://msdn.microsoft.com/en-us/windows/hardware/gg463429
    testZipFile("Outlook2007_Calendar.xps", "ref/complex_files/Outlook2007_Calendar.xps", function(file) {
       var zip = new JSZip(file);
-      // the zip file contains 15 entries, but we get 23 when creating all the sub-folders.
-      equal(zip.filter(function(){return true;}).length, 23, "the zip contains the good number of elements.");
+      // the zip file contains 15 entries.
+      equal(zip.filter(function(){return true;}).length, 15, "the zip contains the good number of elements.");
       ok(zip.file("[Content_Types].xml").asText().indexOf("application/vnd.ms-package.xps-fixeddocument+xml") !== -1, "the zip was correctly read.");
    });
 
    // an example file in http://cheeso.members.winisp.net/srcview.aspx?dir=js-unzip
    // the data come from http://www.antarctica.ac.uk/met/READER/upper_air/
    testZipFile("AntarcticaTemps.xlsx", "ref/complex_files/AntarcticaTemps.xlsx", function(file) {
       var zip = new JSZip(file);
-      // the zip file contains 16 entries, but we get 27 when creating all the sub-folders.
-      equal(zip.filter(function(){return true;}).length, 27, "the zip contains the good number of elements.");
+      // the zip file contains 17 entries.
+      equal(zip.filter(function(){return true;}).length, 17, "the zip contains the good number of elements.");
       ok(zip.file("[Content_Types].xml").asText().indexOf("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml") !== -1, "the zip was correctly read.");
    });
 
    // same as above, but in the Open Document format
    testZipFile("AntarcticaTemps.ods", "ref/complex_files/AntarcticaTemps.ods", function(file) {
       var zip = new JSZip(file);
-      // the zip file contains 19 entries, but we get 27 when creating all the sub-folders.
-      equal(zip.filter(function(){return true;}).length, 27, "the zip contains the good number of elements.");
+      // the zip file contains 20 entries.
+      equal(zip.filter(function(){return true;}).length, 20, "the zip contains the good number of elements.");
       ok(zip.file("META-INF/manifest.xml").asText().indexOf("application/vnd.oasis.opendocument.spreadsheet") !== -1, "the zip was correctly read.");
    });
 }