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

remove dialogs with state

Browse source
This commit is contained in:
rolux 2011-11-04 18:10:48 +00:00
commit d3225ad4af
6 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ pandora.ui.accountDialogOptions = function(action, value) {
id: 'cancel' + Ox.toTitleCase(action),
title: 'Cancel'
}).bindEvent('click', function() {
pandora.$ui.accountDialog.close();
pandora.$ui.accountDialog.close().remove();
pandora.URL.update();
});
} else if (type == 'submit') {
@ -140,7 +140,7 @@ pandora.ui.accountForm = function(action, value) {
if (action == 'signin') {
pandora.api.signin(data, function(result) {
if (!result.data.errors) {
pandora.$ui.accountDialog.close();
pandora.$ui.accountDialog.close().remove();
pandora.signin(result.data);
} else {
pandora.$ui.accountDialog.enableButtons();
@ -150,7 +150,7 @@ pandora.ui.accountForm = function(action, value) {
} else if (action == 'signup') {
pandora.api.signup(data, function(result) {
if (!result.data.errors) {
pandora.$ui.accountDialog.close();
pandora.$ui.accountDialog.close().remove();
pandora.signin(result.data);
pandora.ui.accountWelcomeDialog().open();
} else {
@ -174,7 +174,7 @@ pandora.ui.accountForm = function(action, value) {
} else if (action == 'resetAndSignin') {
pandora.api.resetPassword(data, function(result) {
if (!result.data.errors) {
pandora.$ui.accountDialog.close();
pandora.$ui.accountDialog.close().remove();
pandora.signin(result.data);
} else {
pandora.$ui.accountDialog.enableButtons();
@ -320,14 +320,14 @@ pandora.ui.accountSignoutDialog = function() {
id: 'cancel',
title: 'Cancel'
}).bindEvent('click', function() {
that.close();
that.close().remove();
pandora.URL.update();
}),
Ox.Button({
id: 'signout',
title: 'Sign Out'
}).bindEvent('click', function() {
that.close();
that.close().remove();
pandora.api.signout({}, function(result) {
pandora.signout(result.data);
});
@ -360,7 +360,7 @@ pandora.ui.accountWelcomeDialog = function() {
id: 'preferences',
title: 'Preferences...'
}).bindEvent('click', function() {
that.close();
that.close().remove();
pandora.$ui.preferencesDialog = pandora.ui.preferencesDialog().open();
}),
{},
@ -368,7 +368,7 @@ pandora.ui.accountWelcomeDialog = function() {
id: 'close',
title: 'Close'
}).bindEvent('click', function() {
that.close();
that.close().remove();
})
],
content: Ox.Element()