rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 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.onAuthSuccess = function(user) {
this.user.uuid = user.uuid; this.user.uuid = user.uuid;
if(this.user.shouldMerge && this.hasLocalData()) { // if(this.user.shouldMerge && this.hasLocalData()) {
apiController.mergeLocalDataRemotely(this.user, function(){ // apiController.mergeLocalDataRemotely(this.user, function(){
window.location.reload(); // window.location.reload();
}); // });
} else { // } else {
window.location.reload(); window.location.reload();
} // }
this.showLogin = false; this.showLogin = false;
this.showRegistration = false; this.showRegistration = false;

8
app/assets/templates/frontend/header.html.haml
View File

@@ -28,10 +28,10 @@
%input.form-control.login-input{:autofocus => 'autofocus', :name => 'email', :placeholder => 'Email', :required => true, :type => 'email', 'ng-model' => 'ctrl.loginData.email'} %input.form-control.login-input{:autofocus => 'autofocus', :name => 'email', :placeholder => 'Email', :required => true, :type => 'email', 'ng-model' => 'ctrl.loginData.email'}
.form-tag.has-feedback .form-tag.has-feedback
%input.form-control.login-input{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'ctrl.loginData.user_password'} %input.form-control.login-input{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'ctrl.loginData.user_password'}
.checkbox{"ng-if" => "ctrl.hasLocalData()"} -# .checkbox{"ng-if" => "ctrl.hasLocalData()"}
%label -# %label
%input{"type" => "checkbox", "ng-model" => "ctrl.user.shouldMerge", "ng-bind" => "true", "ng-change" => "ctrl.mergeLocalChanged()"} -# %input{"type" => "checkbox", "ng-model" => "ctrl.user.shouldMerge", "ng-bind" => "true", "ng-change" => "ctrl.mergeLocalChanged()"}
Merge local notes -# Merge local notes
%button.btn.dark-button.half-button{"ng-click" => "ctrl.loginSubmitPressed()", "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"} %button.btn.dark-button.half-button{"ng-click" => "ctrl.loginSubmitPressed()", "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"}
%span Sign In %span Sign In
%button.btn.dark-button.half-button{"ng-click" => "ctrl.submitRegistrationForm()", "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"} %button.btn.dark-button.half-button{"ng-click" => "ctrl.submitRegistrationForm()", "data-style" => "expand-right", "data-size" => "s", "state" => "buttonState"}

14
vendor/assets/javascripts/transpiled.js vendored
View File

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

2
vendor/assets/javascripts/transpiled.js.map vendored
View File

File diff suppressed because one or more lines are too long