extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 15:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure dialog is created before trying to update buttons

Browse Source
This commit is contained in:
Nathan Gray 2013-07-20 13:05:03 +00:00
parent 14db2bd42e
commit 2beadad730
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/js/et2_widget_dialog.js
View File

@ -321,11 +321,7 @@ var et2_dialog = et2_widget.extend({
*/ */
set_buttons: function(buttons) { set_buttons: function(buttons) {
this.options.buttons = buttons; this.options.buttons = buttons;
if(typeof buttons == "number" && typeof this._buttons[buttons] != "undefined") if (buttons instanceof Array)
{
this.div.dialog("option", "buttons", this._buttons[buttons]);
}
else if (buttons instanceof Array)
{ {
for (var i = 0; i < buttons.length; i++) for (var i = 0; i < buttons.length; i++)
{ {
@ -335,10 +331,16 @@ var et2_dialog = et2_widget.extend({
} }
} }
this.options.buttons = buttons; this.options.buttons = buttons;
this.div.dialog("option", "buttons", buttons);
} }
// Focus default button so enter works
$j('.ui-dialog-buttonpane button[default]',this.div.parent()).focus(); // If dialog already created, update buttons
if(this.div.data('uiDialog'))
{
this.div.dialog("option", "buttons", buttons);
// Focus default button so enter works
$j('.ui-dialog-buttonpane button[default]',this.div.parent()).focus();
}
}, },
/** /**