fix password reset

This commit is contained in:
j 2011-10-07 19:56:39 +02:00
commit e2a76470ae
5 changed files with 20 additions and 18 deletions

View file

@ -27,7 +27,7 @@ pandora.autovalidateListname = function(value, blur, callback) {
while (value.indexOf(v) > -1) {
value = value.replace(new RegExp(v, 'g'), v[0] + (v[0] == '\\' ? v[1] : ''));
}
})
});
callback(value);
};
@ -44,7 +44,7 @@ pandora.autovalidateUsername = function(value, blur, callback) {
while (value.indexOf(v) > -1) {
value = value.replace(new RegExp(v, 'g'), v[0]);
}
})
});
callback(value);
};

View file

@ -71,10 +71,11 @@ pandora.ui.accountDialogOptions = function(action, value) {
});
}
}
return {
buttons: Ox.merge(buttons[action].map(function(type) {
return button(type);
}), [{}, button('cancel'), button('submit')]),
}), [button('cancel'), button('submit')]),
content: Ox.Element()
.append(
$('<img>')
@ -162,11 +163,11 @@ pandora.ui.accountForm = function(action, value) {
pandora.api.resetPassword(data, function(result) {
if (!result.data.errors) {
pandora.$ui.accountDialog.close();
pandora.login(result.data);
pandora.signin(result.data);
} else {
callback([{id: 'code', message: 'Incorrect code'}]);
}
})
});
}
}
}).bindEvent({