extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:04:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom buttons with no template not working

Browse Source
This commit is contained in:
Nathan Gray 2013-04-22 22:56:55 +00:00
parent 5e84ddd935
commit 516872e322
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_widget_dialog.js
View File

@ -324,13 +324,13 @@ var et2_dialog = et2_widget.extend({
{ {
this.div.dialog("option", "buttons", this._buttons[buttons]); this.div.dialog("option", "buttons", this._buttons[buttons]);
} }
else if (typeof buttons == "array") else if (buttons instanceof Array)
{ {
for (var i = 0; i < buttons.length; i++) for (var i = 0; i < buttons.length; i++)
{ {
if(!buttons[i].click) if(!buttons[i].click)
{ {
buttons[i].click = jQuery.proxy(this.click,this,buttons[i].id); buttons[i].click = jQuery.proxy(this.click,this,null,buttons[i].id);
} }
} }
this.options.buttons = buttons; this.options.buttons = buttons;
@ -388,6 +388,7 @@ var et2_dialog = et2_widget.extend({
this.set_message(this.options.message); this.set_message(this.options.message);
this.set_dialog_type(this.options.dialog_type); this.set_dialog_type(this.options.dialog_type);
} }
this.set_buttons(this.options.buttons);
this.div.dialog({ this.div.dialog({
// Pass the internal object, not the option // Pass the internal object, not the option
buttons: typeof this.options.buttons == "number" ? this._buttons[this.options.buttons] : this.options.buttons, buttons: typeof this.options.buttons == "number" ? this._buttons[this.options.buttons] : this.options.buttons,