Changeset 8009

Timestamp:

Aug 13, 2021, 7:46:28 AM (10 months ago)

Author:

Nicklas Nordborg

Message:

References #2258: Drag and drop file upload

Ignoring hidden files and folders (name is starting with a '.') unless the hidden item has been explicitely selected as a top-level file or folder.

File:

• branches/3.19-stable/www/filemanager/upload/drag_drop_upload.js (modified) (1 diff)

branches/3.19-stable/www/filemanager/upload/drag_drop_upload.js

@@ -109 +109 @@
     var ff = filesAndFolders.splice(0, 1)[0];
     currentFolder = ff.subfolder || '';
-    if (ff.isFile)
-    {
-      // Get the file item as a 'File' object (its an async operation)
-      ff.file(upload.gotFile);
-    }
-    else if (ff.isDirectory)
-    {
-      // Save the currentFolder for later use in 'upload.gotFolder'
-      currentFolder += ff.name+'/';
-      // Read files and subfolders (its an async operation)
-      currentDirectoryReader = ff.createReader();
-      currentDirectoryReader.readEntries(upload.gotFolder);
-    }
-    else
-    {
-      // Process next entry
-      upload.processFilesAndFolders();
-    }
+    // Ignore files/directories inside subfolders starting with '.' unless
+    // the top folder that was selected is also hidden
+    var ignore = ff.name.charAt(0)=='.' && (currentFolder.length > 0 && currentFolder.charAt(0)!='.');
+    if (!ignore)
+    {
+      if (ff.isFile)
+      {
+        // Get the file item as a 'File' object (its an async operation)
+        ff.file(upload.gotFile);
+        return;
+      }
+      else if (ff.isDirectory)
+      {
+        // Save the currentFolder for later use in 'upload.gotFolder'
+        currentFolder += ff.name+'/';
+        // Read files and subfolders (its an async operation)
+        currentDirectoryReader = ff.createReader();
+        currentDirectoryReader.readEntries(upload.gotFolder);
+        return;
+      }
+    }
+    
+    // Process next entry
+    upload.processFilesAndFolders();
   }