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

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

Browse source
This commit is contained in:
rolux 2013-03-04 12:54:06 +00:00
parent 4b9336078b
commit 80d479f3f0
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/pandora/helpDialog.js
View file

@ -30,7 +30,7 @@ pandora.ui.helpDialog = function() {
buttons: [ buttons: [
Ox.Button({ Ox.Button({
id: 'switch', id: 'switch',
title: pandora.site.site.name + ' API...' title: 'API Documentation...'
}).bindEvent({ }).bindEvent({
click: function() { click: function() {
pandora.UI.set({page: 'api', 'hash.anchor': ''}) pandora.UI.set({page: 'api', 'hash.anchor': ''})
@ -59,7 +59,7 @@ pandora.ui.helpDialog = function() {
}) })
.bindEvent({ .bindEvent({
close: function() { close: function() {
pandora.UI.set({page: '', 'hash.anchor': ''}); pandora.user.ui.page == 'help' && pandora.UI.set({page: '', 'hash.anchor': ''});
}, },
resize: function() { resize: function() {
$list.size(); $list.size();

14
static/js/pandora/preferencesDialog.js
View file

@ -133,7 +133,6 @@ pandora.ui.preferencesDialog = function() {
title: 'Sign Out...' title: 'Sign Out...'
}).bindEvent({ }).bindEvent({
click: function() { click: function() {
$dialog.close();
pandora.UI.set({page: 'signout'}); pandora.UI.set({page: 'signout'});
} }
}), }),
@ -154,13 +153,12 @@ pandora.ui.preferencesDialog = function() {
minWidth: 432, minWidth: 432,
title: 'Preferences', title: 'Preferences',
width: 432 width: 432
}), })
closeDialog = $dialog.close; .bindEvent({
close: function() {
$dialog.close = function() { pandora.user.ui.page == 'preferences' && pandora.UI.set({page: ''});
closeDialog(); }
pandora.UI.set({page: ''}); });
};
return $dialog; return $dialog;

2
static/js/pandora/siteDialog.js
View file

@ -118,7 +118,7 @@ pandora.ui.siteDialog = function(section) {
}) })
.bindEvent({ .bindEvent({
close: function(data) { close: function(data) {
pandora.UI.set({page: ''}); Ox.getObjectById(tabs, pandora.user.ui.page) && pandora.UI.set({page: ''});
}, },
resize: function(data) { resize: function(data) {
var selected = $tabPanel.selected(); var selected = $tabPanel.selected();