SFJS 0.3.60

This commit is contained in:
Mo Bitar
2019-05-28 14:09:29 -05:00
parent 8d4f86242a
commit 394958241b
7 changed files with 31 additions and 7709 deletions

View File

@@ -31,14 +31,6 @@ angular.module('app')
this.componentStack = [];
this.isDesktop = isDesktopApplication();
$rootScope.$on("sync:taking-too-long", function(){
this.syncTakingTooLong = true;
}.bind(this));
$rootScope.$on("sync:completed", function(){
this.syncTakingTooLong = false;
}.bind(this));
const MinimumStatusDurationMs = 400;
syncManager.addEventHandler((eventName, data) => {
@@ -46,7 +38,14 @@ angular.module('app')
return;
}
if(eventName == "sync:completed") {
if(eventName == "sync:taking-too-long") {
this.syncTakingTooLong = true;
}
else if(eventName == "sync:completed") {
this.syncTakingTooLong = false;
if(this.note.dirty) {
// if we're still dirty, don't change status, a sync is likely upcoming.
} else {

View File

@@ -301,7 +301,7 @@ class AccountMenu {
if(item.content_type == "SN|Component") { item.active = false; }
}
syncManager.sync({additionalFields: ["created_at", "updated_at"]}).then((response) => {
syncManager.sync().then((response) => {
// Response can be null if syncing offline
callback(response, errorCount);
});

View File

@@ -22,7 +22,9 @@
%form.sk-panel-form{"ng-submit" => "submitAuthForm()"}
.sk-panel-section
%input.sk-input.contrast{:placeholder => 'Email', "sn-autofocus" => 'true', "should-focus" => "true", :name => 'email', :required => true, :type => 'email', 'ng-model' => 'formData.email', 'spellcheck' => 'false'}
%input.sk-input.contrast{:placeholder => 'Email', "sn-autofocus" => 'true',
"should-focus" => "true", :name => 'email', :required => true, :type => 'email',
'ng-model' => 'formData.email', 'spellcheck' => 'false', "ng-model-options"=> "{allowInvalid: true}"}
%input.sk-input.contrast{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.user_password', 'sn-enter' => 'submitAuthForm()'}
%input.sk-input.contrast{:placeholder => 'Confirm Password', "ng-if" => "formData.showRegister", :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.password_conf', 'sn-enter' => 'submitAuthForm()'}
.sk-panel-row