rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable merge temp

Browse Source
This commit is contained in:
Mo Bitar
2016-12-28 12:12:51 -06:00
parent c7677b8896
commit 8ec59a58a8
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/app/frontend/controllers/header.js
View File

@@ -150,13 +150,13 @@ angular.module('app.frontend')
this.onAuthSuccess = function(user) {
this.user.uuid = user.uuid;
if(this.user.shouldMerge && this.hasLocalData()) {
apiController.mergeLocalDataRemotely(this.user, function(){
window.location.reload();
});
} else {
// if(this.user.shouldMerge && this.hasLocalData()) {
// apiController.mergeLocalDataRemotely(this.user, function(){
// window.location.reload();
// });
// } else {
window.location.reload();
}
// }
this.showLogin = false;
this.showRegistration = false;