"Fixed bug in deleting files, and made the delete process smoother"

cryptic-io · Sep 15, 2013 · d42f2f6 · d42f2f6
1 parent 83e8b61
commit d42f2f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/js/models/user/UserBlob.js b/js/models/user/UserBlob.js
@@ -96,7 +96,7 @@ define(["apiEndPoints", "models/File", "models/RSA", "models/user/FS", "tools/Mu
       var folder = this.getFile(fs, loc)
       , file = folder.value[filename]
 
-      userFS.removeFile(fs, loc, filename)
+      fs = userFS.removeFile(fs, loc, filename)
 
       this.removeFileFromServer(file.value)
 
@@ -124,7 +124,7 @@ define(["apiEndPoints", "models/File", "models/RSA", "models/user/FS", "tools/Mu
 
     }
 
-    , getParentFsLocation: userFS.getParentFsLocation
+    , getParentFsLocation: _.bind(userFS.getParentFsLocation, userFS)
 
     // Given a fs and location, return an array of all the files inside
     , getFile: userFS.getFile

diff --git a/js/routes/User.js b/js/routes/User.js
@@ -73,6 +73,12 @@ define(
                 .then(hideSingleFileAndShowUpload)
       })
 
+      userView.listenTo(userView.singleFileInfo, "fs:file:delete", function(fsLocation){
+        //if we want to show an indication that the file was deleted, we do that here
+        hideSingleFileAndShowUpload()
+      })
+
+
       hideSingleFileAndShowUpload = function(){
         viewport.placeRightUpOffScreen(userView.singleFileInfo.el, 1)
                 .placeRightOfCenter(fileView.el, 1)

diff --git a/js/views/user/SingleFileInfo.js b/js/views/user/SingleFileInfo.js
@@ -44,6 +44,7 @@ define(["jade!templates/user/SingleFileInfo", "tools/humanReadableByteLength"],
             , parentLocation = userBlob.getParentFsLocation(fsLocation)
             this.model.removeFile(this.file.location, this.file.filename)
             this.model.set('fsLocation', parentLocation)
+            this.trigger("fs:file:delete",fsLocation)
         },
 
         toggleShareOptions : function(){