From e2517c3c1e7c4c8d66f936203b856b3aea845417 Mon Sep 17 00:00:00 2001
From: Jon Lambson <jon.lambson@daplie.com>
Date: Fri, 27 Oct 2017 11:00:55 -0600
Subject: [PATCH] almost there

---
 js/controllers/website-controller.js | 33 ++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js
index 2583a75..6b6366c 100644
--- a/js/controllers/website-controller.js
+++ b/js/controllers/website-controller.js
@@ -206,6 +206,7 @@ app.controller('websiteCtrl', [
   vm._uploadFile = function (pkg, opts) {
     vm.newFileUploaded = opts.newFile.name;
     opts.progress = opts.progress || opts;
+    debugger;
     return pkg.add({
       hostname: opts.domain
     , domain: opts.domain
@@ -234,8 +235,10 @@ app.controller('websiteCtrl', [
       opts.progress.uploadTotal = 0;
       vm.buildNotification(result, msg);
       vm.cleanArrays();
-      vm.Sites.allContents(vm.copyR);
-      // vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
+      debugger;
+      var path = vm.breadcrumbsPath.join('/');
+      cleanPathQuery(path);
+      vm.Sites.contents(vm.copyR, vm.cleanedPath);
     });
   };
 
@@ -372,10 +375,9 @@ app.controller('websiteCtrl', [
       // sub: r.sub,
       path: r.shareAccess.path
     }).then(function (result) {
+      debugger;
       if (r.shareAccess.path !== '/') {
-        var strictPathName = r.shareAccess.path.split('/');
-        strictPathName = strictPathName[strictPathName.length - 2];
-        vm.breadcrumbs.push(strictPathName);
+
       } else {
         vm.breadcrumbs.push('root');
       }
@@ -394,6 +396,7 @@ app.controller('websiteCtrl', [
   };
 
   var cleanPathQuery = function (path) {
+    debugger;
     vm.cleanedPath = path.replace(/\/+/g, '/');
     return vm.cleanedPath;
   };
@@ -563,12 +566,15 @@ app.controller('websiteCtrl', [
       vm.buildNotification(result, msg);
       if (deletedFolder) {
         vm.cleanArrays();
+        debugger;
         vm.Sites.allContents(vm.copyR);
         // vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
       } else {
         vm.cleanArrays();
-        vm.Sites.allContents(vm.copyR);
-        // vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
+        debugger;
+        var path = vm.breadcrumbsPath.join('/');
+        cleanPathQuery(path);
+        vm.Sites.contents(vm.copyR, vm.cleanedPath);
       }
     });
   };
@@ -795,6 +801,17 @@ app.controller('websiteCtrl', [
     vm.breadcrumbs = [];
     vm.siteFiles = [];
     vm.siteDirectories = [];
+    if (vm.previousSearchQuery === undefined) {
+      vm.previousSearchQuery = '/';
+    }
+    var getBreadcrumbsPath = vm.previousSearchQuery;
+    vm.breadcrumbsPath = getBreadcrumbsPath.split('/');
+    var getBreadcrumbs = vm.previousSearchQuery.split('/');
+    getBreadcrumbs.forEach(function(crumb){
+      if(crumb !== '') {
+        vm.breadcrumbs.push(crumb);
+      }
+    });
   };
 
   vm.checkShareRights = function (r) {
@@ -810,6 +827,8 @@ app.controller('websiteCtrl', [
         r.shareAccess.invite = true;
       }
       r.shareAccess.path = r.path;
+      vm.strictPath = r.shareAccess.path;
+      vm.previousSearchQuery = vm.strictPath;
       console.log(r.shareAccess);
     } else {
       r.shareAccess = { write: true, read: true, invite: true, path: '/' };