Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Fix multiple new passphrase windows bug - Closes #16 #39

Merged
merged 3 commits into from Mar 6, 2017
Merged

Fix multiple new passphrase windows bug - Closes #16 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
093d113
Fix multiple new passphrase windows bug #16
Mar 2, 2017
6689056
Fix a typo
Mar 2, 2017
48822d9
Make login work without mouse
Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/components/login/login.jade
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@ md-card
md-card-title-text
span.md-title Sign In
md-card-content
form
form(ng-submit='$ctrl.go()')
md-input-container.md-block(md-is-error='$ctrl.valid === 0')
label Enter your passphrase
input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random')
input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random', autofocus)
md-input-container.md-block
md-checkbox.md-primary(ng-model="$ctrl.show_passphrase", aria-label="Show passphrase") Show passphrase
md-content(layout='row', layout-align='center center')
Expand Down
7 changes: 2 additions & 5 deletions src/app/components/login/login.js
View file
Open in desktop
Expand Up @@ -114,11 +114,8 @@ app.component('login', {
}

if (count >= total) {
this.$timeout(() => {
this.stop()
this.setNew()
})

this.stop()
this.setNew()
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/transactions/transactions.jade
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ md-card.offline-hide
span.tx(ng-switch-when='4') Multisignature Creation
span.tx(ng-switch-when='5') Blockchain Application Registration
span.tx(ng-switch-when='6') Transfer Lisk to Blockchain Application
span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Applicatio
span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Application
span(ng-switch-default)
span(ng-bind='transaction.senderId', ng-if='transaction.senderId !== $ctrl.account.address')
span(ng-bind='transaction.recipientId', ng-if='transaction.senderId === $ctrl.account.address')
Expand Down