coolaj86
/
walnut_launchpad.html
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaning up some weird loading

This commit is contained in:
Jon Lambson 2017-11-07 16:35:13 -07:00
parent 67c4e8663f
commit 655b3117b7
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/controllers/website-controller.js
View File

@ -199,14 +199,13 @@ app.controller('websiteCtrl', [
}; };
vm.paramInit = function () { vm.paramInit = function () {
// Share example -> ?token=fe8386d7ad6273bd9ca29864148c0d2d // Share example -> ?token=fe8386d7ad6273bd9ca29864148c0d2d©
if ($rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token !== undefined) { if ($rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token !== undefined) {
vm.Shares.inviteToken = $rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token; vm.Shares.inviteToken = $rootScope.urlCrumbs[$rootScope.urlCrumbs.length -1].params.token;
var result = { data: { info: true } }; var result = { data: { info: true } };
var msg = "You have a new share."; var msg = "You have a new share.";
vm.buildNotification(result, msg); vm.buildNotification(result, msg);
} }
console.log($rootScope,$location);
// Referrer example -> #referrer=daplieeleven.daplie.me // Referrer example -> #referrer=daplieeleven.daplie.me
vm.referrerSelectedDomainName = $location.url().split('=')[1]; vm.referrerSelectedDomainName = $location.url().split('=')[1];
if ($location.url().includes('referrer')) { if ($location.url().includes('referrer')) {
@ -271,6 +270,7 @@ app.controller('websiteCtrl', [
vm.Sites.contents(vm.copyR, vm.cleanedPath); vm.Sites.contents(vm.copyR, vm.cleanedPath);
} else { } else {
$location.url($location.path()); $location.url($location.path());
vm.listSites();
} }
}); });
}; };
@ -409,6 +409,9 @@ app.controller('websiteCtrl', [
, sub: r.sub , sub: r.sub
, path: r.shareAccess.path , path: r.shareAccess.path
}).then(function (result) { }).then(function (result) {
if (result.data.error) {
vm.folderStructure = result;
} else {
vm.cleanArrays(); vm.cleanArrays();
vm.folderStructure = result; vm.folderStructure = result;
result.data.forEach(function(data){ result.data.forEach(function(data){
@ -419,6 +422,7 @@ app.controller('websiteCtrl', [
vm.siteDirectories.push(data.name); vm.siteDirectories.push(data.name);
} }
}); });
}
vm.displaySpinner = 'hidden'; vm.displaySpinner = 'hidden';
vm.currentFolder = vm.breadcrumbs[vm.breadcrumbs.length - 1]; vm.currentFolder = vm.breadcrumbs[vm.breadcrumbs.length - 1];
}); });
@ -963,6 +967,8 @@ app.controller('websiteCtrl', [
vm.websiteTiles = false; vm.websiteTiles = false;
vm.showBackBtn = false; vm.showBackBtn = false;
vm.autoPopulateWebPath = ''; vm.autoPopulateWebPath = '';
vm.displaySpinner = '';
vm.folderStructure = undefined;
}, 150); }, 150);
}; };
}]); }]);

2
js/www@daplie.com.js
View File

@ -116,7 +116,7 @@ OAUTH3._pkgs['www@daplie.com'] = {
, archive: function (opts) { , archive: function (opts) {
var providerUri = opts.audience; var providerUri = opts.audience;
var session = opts.session; var session = opts.session;
debugger;
return OAUTH3.request({ return OAUTH3.request({
method: 'POST' method: 'POST'
, url: OAUTH3.url.normalize(providerUri) , url: OAUTH3.url.normalize(providerUri)