0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

use submit event instead of submit option

Browse source
This commit is contained in:
rolux 2012-06-05 11:11:34 +02:00
parent 65a5e58436
commit 1e9e56e670
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
static/js/pandora/account.js
View file

@ -120,13 +120,6 @@ pandora.ui.accountDialogOptions = function(action, value) {
pandora.ui.accountForm = function(action, value) { pandora.ui.accountForm = function(action, value) {
if (pandora.$ui.accountForm) { if (pandora.$ui.accountForm) {
pandora.$ui.accountForm.items.forEach(function(item) { pandora.$ui.accountForm.items.forEach(function(item) {
if (item.options('id') == 'usernameOrEmail') {
//Ox.Log('', 'REMOVING')
//Ox.Event.unbind('usernameOrEmailSelect')
//Ox.Event.unbind('usernameOrEmailSelectMenu')
//Ox.Event.unbind('usernameOrEmailInput')
}
//Ox.Log('', 'REMOVING ITEM', item.options('id'));
item.remove(); item.remove();
}); });
} }
@ -141,28 +134,29 @@ pandora.ui.accountForm = function(action, value) {
}), }),
that = Ox.Form({ that = Ox.Form({
id: 'accountForm' + Ox.toTitleCase(action), id: 'accountForm' + Ox.toTitleCase(action),
items: $items, items: $items
submit: function(data, callback) { }).bindEvent({
submit: function(data) {
pandora.$ui.accountDialog.disableButtons(); pandora.$ui.accountDialog.disableButtons();
if (action == 'signin') { if (action == 'signin') {
pandora.api.signin(data, function(result) { pandora.api.signin(data.values, function(result) {
if (!result.data.errors) { if (!result.data.errors) {
pandora.$ui.accountDialog.close(); pandora.$ui.accountDialog.close();
pandora.signin(result.data); pandora.signin(result.data);
} else { } else {
pandora.$ui.accountDialog.enableButtons(); pandora.$ui.accountDialog.enableButtons();
callback([{id: 'password', message: 'Incorrect password'}]); that.setMessages([{id: 'password', message: 'Incorrect password'}]);
} }
}); });
} else if (action == 'signup') { } else if (action == 'signup') {
pandora.api.signup(data, function(result) { pandora.api.signup(data.values, function(result) {
if (!result.data.errors) { if (!result.data.errors) {
pandora.$ui.accountDialog.close(); pandora.$ui.accountDialog.close();
pandora.signin(result.data); pandora.signin(result.data);
pandora.ui.accountWelcomeDialog().open(); pandora.ui.accountWelcomeDialog().open();
} else { } else {
pandora.$ui.accountDialog.enableButtons(); pandora.$ui.accountDialog.enableButtons();
callback([{id: 'password', message: result.data.errors.toString()}]); // fixme that.setMessages([{id: 'password', message: result.data.errors.toString()}]); // fixme
} }
}); });
} else if (action == 'reset') { } else if (action == 'reset') {
@ -176,27 +170,23 @@ pandora.ui.accountForm = function(action, value) {
pandora.$ui.accountDialog.enableButtons(); pandora.$ui.accountDialog.enableButtons();
} else { } else {
pandora.$ui.accountDialog.enableButtons(); pandora.$ui.accountDialog.enableButtons();
callback([{id: 'usernameOrEmail', message: 'Unknown ' + (key == 'username' ? 'username' : 'e-mail address')}]) that.setMessages([{id: 'usernameOrEmail', message: 'Unknown ' + (key == 'username' ? 'username' : 'e-mail address')}])
} }
}); });
} else if (action == 'resetAndSignin') { } else if (action == 'resetAndSignin') {
pandora.api.resetPassword(data, function(result) { pandora.api.resetPassword(data.values, function(result) {
if (!result.data.errors) { if (!result.data.errors) {
pandora.$ui.accountDialog.close(); pandora.$ui.accountDialog.close();
pandora.signin(result.data); pandora.signin(result.data);
} else { } else {
pandora.$ui.accountDialog.enableButtons(); pandora.$ui.accountDialog.enableButtons();
callback([{id: 'code', message: 'Incorrect code'}]); that.setMessages([{id: 'code', message: 'Incorrect code'}]);
} }
}); });
} }
}
}).bindEvent({
submit: function(data) {
}, },
validate: function(data) { validate: function(data) {
Ox.Log('', 'FORM VALIDATE', data, action, 'submit' + Ox.toTitleCase(action));
pandora.$ui.accountDialog[ pandora.$ui.accountDialog[
(data.valid ? 'enable' : 'disable') + 'Button' (data.valid ? 'enable' : 'disable') + 'Button'
]('submit' + Ox.toTitleCase(action)); ]('submit' + Ox.toTitleCase(action));