in dialogs that correspond to pages, make sure that on close, we only set page to '' if the close happened via the dialog, and not in the app panel's page change handler
This commit is contained in:
parent
4b9336078b
commit
80d479f3f0
3 changed files with 9 additions and 11 deletions
|
@ -30,7 +30,7 @@ pandora.ui.helpDialog = function() {
|
|||
buttons: [
|
||||
Ox.Button({
|
||||
id: 'switch',
|
||||
title: pandora.site.site.name + ' API...'
|
||||
title: 'API Documentation...'
|
||||
}).bindEvent({
|
||||
click: function() {
|
||||
pandora.UI.set({page: 'api', 'hash.anchor': ''})
|
||||
|
@ -59,7 +59,7 @@ pandora.ui.helpDialog = function() {
|
|||
})
|
||||
.bindEvent({
|
||||
close: function() {
|
||||
pandora.UI.set({page: '', 'hash.anchor': ''});
|
||||
pandora.user.ui.page == 'help' && pandora.UI.set({page: '', 'hash.anchor': ''});
|
||||
},
|
||||
resize: function() {
|
||||
$list.size();
|
||||
|
|
|
@ -133,7 +133,6 @@ pandora.ui.preferencesDialog = function() {
|
|||
title: 'Sign Out...'
|
||||
}).bindEvent({
|
||||
click: function() {
|
||||
$dialog.close();
|
||||
pandora.UI.set({page: 'signout'});
|
||||
}
|
||||
}),
|
||||
|
@ -154,13 +153,12 @@ pandora.ui.preferencesDialog = function() {
|
|||
minWidth: 432,
|
||||
title: 'Preferences',
|
||||
width: 432
|
||||
}),
|
||||
closeDialog = $dialog.close;
|
||||
|
||||
$dialog.close = function() {
|
||||
closeDialog();
|
||||
pandora.UI.set({page: ''});
|
||||
};
|
||||
})
|
||||
.bindEvent({
|
||||
close: function() {
|
||||
pandora.user.ui.page == 'preferences' && pandora.UI.set({page: ''});
|
||||
}
|
||||
});
|
||||
|
||||
return $dialog;
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ pandora.ui.siteDialog = function(section) {
|
|||
})
|
||||
.bindEvent({
|
||||
close: function(data) {
|
||||
pandora.UI.set({page: ''});
|
||||
Ox.getObjectById(tabs, pandora.user.ui.page) && pandora.UI.set({page: ''});
|
||||
},
|
||||
resize: function(data) {
|
||||
var selected = $tabPanel.selected();
|
||||
|
|
Loading…
Reference in a new issue