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

Revert "Trim trailing whitespace"

Browse Source 
This reverts commit 8bcc4d6222.
This commit is contained in:
Baptiste Grob
2020-03-11 15:11:22 +01:00
parent 8392ee17c3
commit edff5366a9
2 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/directives/views/accountMenu.js
View File

@@ -202,7 +202,7 @@ class AccountMenuCtrl extends PureCtrl {
text: STRING_NON_MATCHING_PASSWORDS text: STRING_NON_MATCHING_PASSWORDS
}); });
return; return;
} }
await this.setFormDataState({ await this.setFormDataState({
confirmPassword: false, confirmPassword: false,
status: STRING_GENERATING_REGISTER_KEYS, status: STRING_GENERATING_REGISTER_KEYS,
@@ -334,7 +334,7 @@ class AccountMenuCtrl extends PureCtrl {
} }
/** /**
* @template * @template
*/ */
async importFileSelected(files) { async importFileSelected(files) {
const run = async () => { const run = async () => {

170
app/assets/templates/directives/account-menu.pug
View File

@@ -6,9 +6,9 @@
.sk-panel-content .sk-panel-content
.sk-panel-section.sk-panel-hero( .sk-panel-section.sk-panel-hero(
ng-if=` ng-if=`
!self.state.user && !self.state.user &&
!self.state.formData.showLogin && !self.state.formData.showLogin &&
!self.state.formData.showRegister && !self.state.formData.showRegister &&
!self.state.formData.mfa` !self.state.formData.mfa`
) )
.sk-panel-row .sk-panel-row
@@ -20,10 +20,10 @@
.sk-button.info.featured(ng-click='self.state.formData.showRegister = true') .sk-button.info.featured(ng-click='self.state.formData.showRegister = true')
.sk-label Register .sk-label Register
.sk-panel-row.sk-p .sk-panel-row.sk-p
| Standard Notes is free on every platform, and comes | Standard Notes is free on every platform, and comes
| standard with sync and encryption. | standard with sync and encryption.
.sk-panel-section(ng-if=` .sk-panel-section(ng-if=`
self.state.formData.showLogin || self.state.formData.showLogin ||
self.state.formData.showRegister` self.state.formData.showRegister`
) )
.sk-panel-section-title .sk-panel-section-title
@@ -31,31 +31,31 @@
form.sk-panel-form(ng-submit='self.submitAuthForm()') form.sk-panel-form(ng-submit='self.submitAuthForm()')
.sk-panel-section .sk-panel-section
input.sk-input.contrast( input.sk-input.contrast(
name='email', name='email',
ng-model='self.state.formData.email', ng-model='self.state.formData.email',
ng-model-options='{allowInvalid: true}', ng-model-options='{allowInvalid: true}',
placeholder='Email', placeholder='Email',
required='', required='',
should-focus='true', should-focus='true',
sn-autofocus='true', sn-autofocus='true',
spellcheck='false', spellcheck='false',
type='email' type='email'
) )
input.sk-input.contrast( input.sk-input.contrast(
name='password', name='password',
ng-model='self.state.formData.user_password', ng-model='self.state.formData.user_password',
placeholder='Password', placeholder='Password',
required='', required='',
sn-enter='self.submitAuthForm()', sn-enter='self.submitAuthForm()',
type='password' type='password'
) )
input.sk-input.contrast( input.sk-input.contrast(
name='password_conf', name='password_conf',
ng-if='self.state.formData.showRegister', ng-if='self.state.formData.showRegister',
ng-model='self.state.formData.password_conf', ng-model='self.state.formData.password_conf',
placeholder='Confirm Password', placeholder='Confirm Password',
required='', required='',
sn-enter='self.submitAuthForm()', sn-enter='self.submitAuthForm()',
type='password' type='password'
) )
.sk-panel-row .sk-panel-row
@@ -73,10 +73,10 @@
.bordered-row.padded-row .bordered-row.padded-row
label.sk-label Sync Server Domain label.sk-label Sync Server Domain
input.sk-input.mt-5.sk-base( input.sk-input.mt-5.sk-base(
name='server', name='server',
ng-model='self.state.formData.url', ng-model='self.state.formData.url',
placeholder='Server URL', placeholder='Server URL',
required='', required='',
type='text' type='text'
) )
label.sk-label.padded-row.sk-panel-row.justify-left( label.sk-label.padded-row.sk-panel-row.justify-left(
@@ -84,28 +84,28 @@
) )
.sk-horizontal-group.tight .sk-horizontal-group.tight
input.sk-input( input.sk-input(
ng-model='self.state.formData.strictSignin', ng-model='self.state.formData.strictSignin',
type='checkbox' type='checkbox'
) )
p.sk-p Use strict sign in p.sk-p Use strict sign in
span span
a.info( a.info(
href='https://standardnotes.org/help/security', href='https://standardnotes.org/help/security',
rel='noopener', rel='noopener',
target='_blank' target='_blank'
) (Learn more) ) (Learn more)
.sk-panel-section.form-submit(ng-if='!self.state.formData.authenticating') .sk-panel-section.form-submit(ng-if='!self.state.formData.authenticating')
.sk-button-group.stretch .sk-button-group.stretch
.sk-button.info.featured( .sk-button.info.featured(
ng-click='self.submitAuthForm()', ng-click='self.submitAuthForm()',
ng-disabled='self.state.formData.authenticating' ng-disabled='self.state.formData.authenticating'
) )
.sk-label {{self.state.formData.showLogin ? "Sign In" : "Register"}} .sk-label {{self.state.formData.showLogin ? "Sign In" : "Register"}}
.sk-notification.neutral(ng-if='self.state.formData.showRegister') .sk-notification.neutral(ng-if='self.state.formData.showRegister')
.sk-notification-title No Password Reset. .sk-notification-title No Password Reset.
.sk-notification-text .sk-notification-text
| Because your notes are encrypted using your password, | Because your notes are encrypted using your password,
| Standard Notes does not have a password reset option. | Standard Notes does not have a password reset option.
| You cannot forget your password. | You cannot forget your password.
.sk-panel-section.no-bottom-pad(ng-if='self.state.formData.status') .sk-panel-section.no-bottom-pad(ng-if='self.state.formData.status')
.sk-horizontal-group .sk-horizontal-group
@@ -115,18 +115,18 @@
label.sk-panel-row.justify-left label.sk-panel-row.justify-left
.sk-horizontal-group.tight .sk-horizontal-group.tight
input( input(
ng-false-value='true', ng-false-value='true',
ng-model='self.state.formData.ephemeral', ng-model='self.state.formData.ephemeral',
ng-true-value='false', ng-true-value='false',
type='checkbox' type='checkbox'
) )
p.sk-p Stay signed in p.sk-p Stay signed in
label.sk-panel-row.justify-left(ng-if='self.notesAndTagsCount() > 0') label.sk-panel-row.justify-left(ng-if='self.notesAndTagsCount() > 0')
.sk-panel-row .sk-panel-row
input( input(
ng-bind='true', ng-bind='true',
ng-change='self.mergeLocalChanged()', ng-change='self.mergeLocalChanged()',
ng-model='self.state.formData.mergeLocal', ng-model='self.state.formData.mergeLocal',
type='checkbox' type='checkbox'
) )
| Merge local data ({{self.notesAndTagsCount()}} notes and tags) | Merge local data ({{self.notesAndTagsCount()}} notes and tags)
@@ -135,12 +135,12 @@
.sk-p.sk-panel-row {{self.state.formData.mfa.message}} .sk-p.sk-panel-row {{self.state.formData.mfa.message}}
.sk-panel-row .sk-panel-row
input.sk-input.contrast( input.sk-input.contrast(
autofocus='true', autofocus='true',
name='mfa', name='mfa',
ng-model='self.state.formData.userMfaCode', ng-model='self.state.formData.userMfaCode',
placeholder='Enter Code', placeholder='Enter Code',
required='', required='',
should-focus='true', should-focus='true',
sn-autofocus='true' sn-autofocus='true'
) )
.sk-button-group.stretch.sk-panel-row.form-submit( .sk-button-group.stretch.sk-panel-row.form-submit(
@@ -156,19 +156,19 @@
.sk-label {{self.state.formData.status}} .sk-label {{self.state.formData.status}}
div( div(
ng-if=` ng-if=`
!self.state.formData.showLogin && !self.state.formData.showLogin &&
!self.state.formData.showRegister && !self.state.formData.showRegister &&
!self.state.formData.mfa` !self.state.formData.mfa`
) )
.sk-panel-section(ng-if='self.state.user') .sk-panel-section(ng-if='self.state.user')
.sk-notification.danger(ng-if='self.syncStatus.error') .sk-notification.danger(ng-if='self.syncStatus.error')
.sk-notification-title Sync Unreachable .sk-notification-title Sync Unreachable
.sk-notification-text .sk-notification-text
| Hmm...we can't seem to sync your account. | Hmm...we can't seem to sync your account.
| The reason: {{self.syncStatus.error.message}} | The reason: {{self.syncStatus.error.message}}
a.sk-a.info-contrast.sk-bold.sk-panel-row( a.sk-a.info-contrast.sk-bold.sk-panel-row(
href='https://standardnotes.org/help', href='https://standardnotes.org/help',
rel='noopener', rel='noopener',
target='_blank' target='_blank'
) Need help? ) Need help?
.sk-panel-row .sk-panel-row
@@ -176,8 +176,8 @@
.sk-h1.sk-bold.wrap {{self.state.user.email}} .sk-h1.sk-bold.wrap {{self.state.user.email}}
.sk-subtitle.subtle.normal {{self.state.server}} .sk-subtitle.subtle.normal {{self.state.server}}
.sk-horizontal-group( .sk-horizontal-group(
delay='1000', delay='1000',
delay-hide='true', delay-hide='true',
show='self.syncStatus.syncOpInProgress || self.syncStatus.needsMoreSync' show='self.syncStatus.syncOpInProgress || self.syncStatus.needsMoreSync'
) )
.sk-spinner.small.info .sk-spinner.small.info
@@ -192,12 +192,12 @@
) )
| Change Password | Change Password
a.sk-a.info.sk-panel-row.condensed( a.sk-a.info.sk-panel-row.condensed(
ng-click="self.openPrivilegesModal('')", ng-click="self.openPrivilegesModal('')",
ng-show='self.state.user' ng-show='self.state.user'
) )
| Manage Privileges | Manage Privileges
a.sk-panel-row.justify-left.condensed.success( a.sk-panel-row.justify-left.condensed.success(
ng-click="self.openPasswordWizard('upgrade-security')", ng-click="self.openPasswordWizard('upgrade-security')",
ng-if='self.state.securityUpdateAvailable' ng-if='self.state.securityUpdateAvailable'
) )
.inline.sk-circle.small.success.mr-8 .inline.sk-circle.small.success.mr-8
@@ -217,28 +217,28 @@
ng-click='self.addPasscodeClicked(); $event.stopPropagation();' ng-click='self.addPasscodeClicked(); $event.stopPropagation();'
) )
.sk-label Add Passcode .sk-label Add Passcode
p.sk-p p.sk-p
| Add a passcode to lock the application and | Add a passcode to lock the application and
| encrypt on-device key storage. | encrypt on-device key storage.
div(ng-if='!self.state.canAddPasscode') div(ng-if='!self.state.canAddPasscode')
p.sk-p p.sk-p
| Adding a passcode is not supported in temporary sessions. Please sign | Adding a passcode is not supported in temporary sessions. Please sign
| out, then sign back in with the "Stay signed in" option checked. | out, then sign back in with the "Stay signed in" option checked.
form.sk-panel-form( form.sk-panel-form(
ng-if='self.state.formData.showPasscodeForm', ng-if='self.state.formData.showPasscodeForm',
ng-submit='self.submitPasscodeForm()' ng-submit='self.submitPasscodeForm()'
) )
.sk-panel-row .sk-panel-row
input.sk-input.contrast( input.sk-input.contrast(
ng-model='self.state.formData.passcode', ng-model='self.state.formData.passcode',
placeholder='Passcode', placeholder='Passcode',
should-focus='true', should-focus='true',
sn-autofocus='true', sn-autofocus='true',
type='password' type='password'
) )
input.sk-input.contrast( input.sk-input.contrast(
ng-model='self.state.formData.confirmPasscode', ng-model='self.state.formData.confirmPasscode',
placeholder='Confirm Passcode', placeholder='Confirm Passcode',
type='password' type='password'
) )
.sk-button-group.stretch.sk-panel-row.form-submit .sk-button-group.stretch.sk-panel-row.form-submit
@@ -259,15 +259,15 @@
a.sk-a.info( a.sk-a.info(
ng-class=`{ ng-class=`{
'boxed' : option.value == self.state.selectedAutoLockInterval 'boxed' : option.value == self.state.selectedAutoLockInterval
}`, }`,
ng-click='self.selectAutoLockInterval(option.value)', ng-click='self.selectAutoLockInterval(option.value)',
ng-repeat='option in self.state.passcodeAutoLockOptions' ng-repeat='option in self.state.passcodeAutoLockOptions'
) )
| {{option.label}} | {{option.label}}
.sk-p The autolock timer begins when the window or tab loses focus. .sk-p The autolock timer begins when the window or tab loses focus.
.sk-panel-row .sk-panel-row
a.sk-a.info.sk-panel-row.condensed( a.sk-a.info.sk-panel-row.condensed(
ng-click="self.openPrivilegesModal('')", ng-click="self.openPrivilegesModal('')",
ng-show='!self.state.user' ng-show='!self.state.user'
) Manage Privileges ) Manage Privileges
a.sk-a.info.sk-panel-row.condensed( a.sk-a.info.sk-panel-row.condensed(
@@ -285,17 +285,17 @@
.sk-input-group .sk-input-group
label.sk-horizontal-group.tight label.sk-horizontal-group.tight
input( input(
ng-change='self.state.mutable.backupEncrypted = true', ng-change='self.state.mutable.backupEncrypted = true',
ng-model='self.state.mutable.backupEncrypted', ng-model='self.state.mutable.backupEncrypted',
ng-value='true', ng-value='true',
type='radio' type='radio'
) )
p.sk-p Encrypted p.sk-p Encrypted
label.sk-horizontal-group.tight label.sk-horizontal-group.tight
input( input(
ng-change='self.state.mutable.backupEncrypted = false', ng-change='self.state.mutable.backupEncrypted = false',
ng-model='self.state.mutable.backupEncrypted', ng-model='self.state.mutable.backupEncrypted',
ng-value='false', ng-value='false',
type='radio' type='radio'
) )
p.sk-p Decrypted p.sk-p Decrypted
@@ -305,32 +305,32 @@
.sk-label Download Backup .sk-label Download Backup
label.sk-button.info label.sk-button.info
input( input(
file-change='->', file-change='->',
handler='self.importFileSelected(files)', handler='self.importFileSelected(files)',
style='display: none;', style='display: none;',
type='file' type='file'
) )
.sk-label Import Backup .sk-label Import Backup
span(ng-if='self.isDesktopApplication()') span(ng-if='self.isDesktopApplication()')
| Backups are automatically created on desktop and can be managed | Backups are automatically created on desktop and can be managed
| via the "Backups" top-level menu. | via the "Backups" top-level menu.
#import-password-request(ng-if='self.state.importData.requestPassword') #import-password-request(ng-if='self.state.importData.requestPassword')
form.sk-panel-form.stretch(ng-submit='self.submitImportPassword()') form.sk-panel-form.stretch(ng-submit='self.submitImportPassword()')
p Enter the account password associated with the import file. p Enter the account password associated with the import file.
input.sk-input.contrast.mt-5( input.sk-input.contrast.mt-5(
autofocus='true', autofocus='true',
ng-model='self.state.importData.password', ng-model='self.state.importData.password',
placeholder='Enter File Account Password', placeholder='Enter File Account Password',
type='password' type='password'
) )
.sk-button-group.stretch.sk-panel-row.form-submit .sk-button-group.stretch.sk-panel-row.form-submit
button.sk-button.info(type='submit') button.sk-button.info(type='submit')
.sk-label Decrypt & Import .sk-label Decrypt & Import
p p
| Importing from backup will not overwrite existing data, | Importing from backup will not overwrite existing data,
| but instead create a duplicate of any differing data. | but instead create a duplicate of any differing data.
p p
| If you'd like to import only a selection of items instead of | If you'd like to import only a selection of items instead of
| the whole file, please use the Batch Manager extension. | the whole file, please use the Batch Manager extension.
.sk-panel-row .sk-panel-row
.sk-spinner.small.info(ng-if='self.state.importData.loading') .sk-spinner.small.info(ng-if='self.state.importData.loading')
@@ -343,9 +343,9 @@
) )
| Cancel | Cancel
a.sk-a.right.danger( a.sk-a.right.danger(
ng-click='self.destroyLocalData()', ng-click='self.destroyLocalData()',
ng-if=` ng-if=`
!self.state.formData.showLogin && !self.state.formData.showLogin &&
!self.state.formData.showRegister` !self.state.formData.showRegister`
) )
| {{ self.state.user ? "Sign out and clear local data" : "Clear all local data" }} | {{ self.state.user ? "Sign out and clear local data" : "Clear all local data" }}