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

working on issues with tabbed dialogs and URLs

Browse source
This commit is contained in:
rolux 2011-11-08 12:53:42 +00:00
parent fdeeb986d4
commit 4a4a8c7ed9
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,7 +291,7 @@ pandora.ui.accountForm = function(action, value) {
validate: pandora.validateUser(selected, true), validate: pandora.validateUser(selected, true),
value: '' value: ''
}).focusInput(); }).focusInput();
//setTimeout(that.submit, 250); that.$element.find('.OxFormMessage:visible').html('').hide();
pandora.$ui.accountDialog.disableButton('submitReset'); pandora.$ui.accountDialog.disableButton('submitReset');
} }
}), }),

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

@ -8,6 +8,7 @@ pandora.ui.siteDialog = function(section) {
Ox.clone(pandora.site.sitePages), Ox.clone(pandora.site.sitePages),
[{id: 'software', title: 'Software'}] [{id: 'software', title: 'Software'}]
); );
Ox.print('SITE DIALOG', section, tabs)
Ox.getObjectById(tabs, section).selected = true; Ox.getObjectById(tabs, section).selected = true;
var $tabPanel = Ox.TabPanel({ var $tabPanel = Ox.TabPanel({
content: function(id) { content: function(id) {
@ -67,7 +68,7 @@ pandora.ui.siteDialog = function(section) {
//pandora.URL.replace('/' + data.selected); //pandora.URL.replace('/' + data.selected);
//fixme: this should be using URL.push / UI.set //fixme: this should be using URL.push / UI.set
//but that currenlty causes another dialog to be opened //but that currenlty causes another dialog to be opened
history.pushState({}, '', '/' + data.selected); history.pushState({/*page: data.selected*/}, '', '/' + data.selected);
} }
}); });
var $dialog = Ox.Dialog({ var $dialog = Ox.Dialog({
@ -77,7 +78,7 @@ pandora.ui.siteDialog = function(section) {
title: 'Close' title: 'Close'
}).bindEvent({ }).bindEvent({
click: function() { click: function() {
$dialog.close(); $dialog.close().remove();
pandora.URL.update(); pandora.URL.update();
} }
}) })