Skip to content

fix iron router error: route never dispatch in case Meteor.loggingIn() i... #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

fix iron router error: route never dispatch in case Meteor.loggingIn() i... #358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
20f451c
fix iron router error: route never dispatch in case Meteor.loggingIn(…
StrongBearCeo Mar 24, 2015
0c4692b
use text link with Box and Onedrive
StrongBearCeo Apr 30, 2015
8c28f2c
Hotfix problem of login loop when login from multiple tabs
StrongBearCeo Jun 2, 2015
2fd9309
Fix Inconsistent password validation for 2 cases
haotangio Jul 3, 2015
0ffbce7
Fix User can an access sign-up page after sign-up
haotangio Jul 3, 2015
e1b799f
Modify account-entry package
StrongBearCeo Jul 6, 2015
f400d75
Update html code for sign up page
StrongBearCeo Jul 8, 2015
151503b
Update html code for forgot-password page
StrongBearCeo Jul 8, 2015
47ac707
Update icons for Sign in and Sign up pages
StrongBearCeo Jul 11, 2015
14e1d23
Update html to signin and signup page
trieunguyendsv Jul 13, 2015
e3ce8d4
Do not check auth as reactive action
StrongBearCeo Jul 13, 2015
520d070
Fix grammar problem
haotangio Jul 28, 2015
0411b73
fix reset password
Feb 17, 2016
aa12c80
fix css reset page
StrongBearCeo Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix reset password
  • Loading branch information
tpt2213 committed Feb 17, 2016
commit 0411b73762278415f71b1bcbf428a5b716e3cd0c
18 changes: 9 additions & 9 deletions client/views/resetPassword/resetPassword.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ Template.entryResetPassword.events

'submit #resetPassword': (event) ->
event.preventDefault()
password = $('input[type="password"]').val()
password = $('input[name="new-password"]').val()

passwordErrors = do (password)->
errMsg = []
msg = false
if password.length < 7
if password.length < 6
errMsg.push t9n("error.minChar")
if password.search(/[a-z]/i) < 0
errMsg.push t9n("error.pwOneLetter")
if password.search(/[0-9]/) < 0
errMsg.push t9n("error.pwOneDigit")
# if password.search(/[a-z]/i) < 0
# errMsg.push t9n("error.pwOneLetter")
# if password.search(/[0-9]/) < 0
# errMsg.push t9n("error.pwOneDigit")

if errMsg.length > 0
msg = ""
Expand All @@ -34,7 +34,7 @@ Template.entryResetPassword.events

Accounts.resetPassword Session.get('resetToken'), password, (error) ->
if error
Session.set('entryError', (error.reason || "Unknown error"))
Session.set 'entryError', (error.reason || "Unknown error")
else
Session.set('resetToken', null)
Router.go AccountsEntry.settings.dashboardRoute
Session.set 'resetToken', null
Router.go AccountsEntry.settings.dashboardRoute
4 changes: 2 additions & 2 deletions shared/router.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ Router.map ->
onBeforeAction: ->
if Meteor.user()
Router.go AccountsEntry.settings.dashboardRoute
Session.set('entryError', undefined)
Session.set('resetToken', @params.resetToken)
Session.set 'entryError', null
Session.set 'resetToken', @params.resetToken
@next()

# Get all the accounts-entry routes one time
Expand Down