Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assign dialog button classes directly (not on dialog open event)

Browse source
This commit is contained in:
Thomas Bruederli 2015-01-08 18:28:42 +01:00
parent 854779406d
commit 0efcfbfa07
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
plugins/tasklist/tasklist.js
View file

@ -1937,7 +1937,7 @@ function rcube_tasklist_ui(settings)
buttons.push({ buttons.push({
text: rcmail.gettext('delete','tasklist'), text: rcmail.gettext('delete','tasklist'),
'class':'delete', 'class': 'delete',
click: function() { click: function() {
if (delete_task(me.selected_task.id)) if (delete_task(me.selected_task.id))
$dialog.dialog('close'); $dialog.dialog('close');
@ -2127,8 +2127,11 @@ function rcube_tasklist_ui(settings)
$('#taskedit').tabs('option', 'active', 0); $('#taskedit').tabs('option', 'active', 0);
// define dialog buttons // define dialog buttons
var buttons = {}; var buttons = [];
buttons[rcmail.gettext('save', 'tasklist')] = function() { buttons.push({
text: rcmail.gettext('save', 'tasklist'),
'class': 'mainaction',
click: function() {
var data = me.selected_task; var data = me.selected_task;
data._status_before = me.selected_task.status + ''; data._status_before = me.selected_task.status + '';
@ -2222,18 +2225,26 @@ function rcube_tasklist_ui(settings)
if (save_task(data, action)) if (save_task(data, action))
$dialog.dialog('close'); $dialog.dialog('close');
}; } // end click:
});
if (action != 'new') { if (action != 'new') {
buttons[rcmail.gettext('delete', 'tasklist')] = function() { buttons.push({
text: rcmail.gettext('delete', 'tasklist'),
'class': 'delete',
click: function() {
if (delete_task(rec.id)) if (delete_task(rec.id))
$dialog.dialog('close'); $dialog.dialog('close');
}; }
});
} }
buttons[rcmail.gettext('cancel', 'tasklist')] = function() { buttons.push({
text: rcmail.gettext('cancel', 'tasklist'),
click: function() {
$dialog.dialog('close'); $dialog.dialog('close');
}; }
});
// open jquery UI dialog // open jquery UI dialog
$dialog.dialog({ $dialog.dialog({
@ -2241,9 +2252,6 @@ function rcube_tasklist_ui(settings)
resizable: (!bw.ie6 && !bw.ie7), // disable for performance reasons resizable: (!bw.ie6 && !bw.ie7), // disable for performance reasons
closeOnEscape: false, closeOnEscape: false,
title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'), title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
open: function() {
$dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
},
close: function() { close: function() {
rcmail.ksearch_blur(); rcmail.ksearch_blur();
editform.hide().appendTo(document.body); editform.hide().appendTo(document.body);
@ -2465,6 +2473,7 @@ function rcube_tasklist_ui(settings)
html = rcmail.gettext('deletetasktconfirm','tasklist'); html = rcmail.gettext('deletetasktconfirm','tasklist');
buttons.push({ buttons.push({
text: rcmail.gettext('delete','tasklist'), text: rcmail.gettext('delete','tasklist'),
'class': 'delete',
click: function() { click: function() {
_delete_task(id, 0); _delete_task(id, 0);
$(this).dialog('close'); $(this).dialog('close');
@ -2653,9 +2662,12 @@ function rcube_tasklist_ui(settings)
}); });
// dialog buttons // dialog buttons
var buttons = {}; var buttons = [];
buttons[rcmail.gettext('save','tasklist')] = function() { buttons.push({
text: rcmail.gettext('save','tasklist'),
'class': 'mainaction',
click: function() {
// do some input validation // do some input validation
if (!name.val() || name.val().length < 2) { if (!name.val() || name.val().length < 2) {
alert(rcmail.gettext('invalidlistproperties', 'tasklist')); alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
@ -2673,11 +2685,15 @@ function rcube_tasklist_ui(settings)
saving_lock = rcmail.set_busy(true, 'tasklist.savingdata'); saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data }); rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data });
$dialog.dialog('close'); $dialog.dialog('close');
}; } // end click:
});
buttons[rcmail.gettext('cancel','tasklist')] = function() { buttons.push({
text: rcmail.gettext('cancel','tasklist'),
click: function() {
$dialog.dialog('close'); $dialog.dialog('close');
}; }
});
// open jquery UI dialog // open jquery UI dialog
$dialog.dialog({ $dialog.dialog({
@ -2685,9 +2701,6 @@ function rcube_tasklist_ui(settings)
resizable: true, resizable: true,
closeOnEscape: false, closeOnEscape: false,
title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'), title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
open: function() {
$dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
},
close: function() { close: function() {
$dialog.dialog('destroy').hide(); $dialog.dialog('destroy').hide();
}, },