cleaning up some weird loading
This commit is contained in:
parent
67c4e8663f
commit
655b3117b7
|
@ -199,14 +199,13 @@ app.controller('websiteCtrl', [
|
|||
};
|
||||
|
||||
vm.paramInit = function () {
|
||||
// Share example -> ?token=fe8386d7ad6273bd9ca29864148c0d2d
|
||||
// Share example -> ?token=fe8386d7ad6273bd9ca29864148c0d2d©
|
||||
if ($rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token !== undefined) {
|
||||
vm.Shares.inviteToken = $rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token;
|
||||
var result = { data: { info: true } };
|
||||
var msg = "You have a new share.";
|
||||
vm.buildNotification(result, msg);
|
||||
}
|
||||
console.log($rootScope,$location);
|
||||
// Referrer example -> #referrer=daplieeleven.daplie.me
|
||||
vm.referrerSelectedDomainName = $location.url().split('=')[1];
|
||||
if ($location.url().includes('referrer')) {
|
||||
|
@ -271,6 +270,7 @@ app.controller('websiteCtrl', [
|
|||
vm.Sites.contents(vm.copyR, vm.cleanedPath);
|
||||
} else {
|
||||
$location.url($location.path());
|
||||
vm.listSites();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
@ -409,16 +409,20 @@ app.controller('websiteCtrl', [
|
|||
, sub: r.sub
|
||||
, path: r.shareAccess.path
|
||||
}).then(function (result) {
|
||||
vm.cleanArrays();
|
||||
vm.folderStructure = result;
|
||||
result.data.forEach(function(data){
|
||||
if (data.file) {
|
||||
vm.siteFiles.push(data.name);
|
||||
}
|
||||
if (data.directory) {
|
||||
vm.siteDirectories.push(data.name);
|
||||
}
|
||||
});
|
||||
if (result.data.error) {
|
||||
vm.folderStructure = result;
|
||||
} else {
|
||||
vm.cleanArrays();
|
||||
vm.folderStructure = result;
|
||||
result.data.forEach(function(data){
|
||||
if (data.file) {
|
||||
vm.siteFiles.push(data.name);
|
||||
}
|
||||
if (data.directory) {
|
||||
vm.siteDirectories.push(data.name);
|
||||
}
|
||||
});
|
||||
}
|
||||
vm.displaySpinner = 'hidden';
|
||||
vm.currentFolder = vm.breadcrumbs[vm.breadcrumbs.length - 1];
|
||||
});
|
||||
|
@ -963,6 +967,8 @@ app.controller('websiteCtrl', [
|
|||
vm.websiteTiles = false;
|
||||
vm.showBackBtn = false;
|
||||
vm.autoPopulateWebPath = '';
|
||||
vm.displaySpinner = '';
|
||||
vm.folderStructure = undefined;
|
||||
}, 150);
|
||||
};
|
||||
}]);
|
||||
|
|
|
@ -116,7 +116,7 @@ OAUTH3._pkgs['www@daplie.com'] = {
|
|||
, archive: function (opts) {
|
||||
var providerUri = opts.audience;
|
||||
var session = opts.session;
|
||||
|
||||
debugger;
|
||||
return OAUTH3.request({
|
||||
method: 'POST'
|
||||
, url: OAUTH3.url.normalize(providerUri)
|
||||
|
|
Loading…
Reference in New Issue