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

Some fixes in invitations dialog

Browse source
This commit is contained in:
Aleksander Machniak 2015-11-20 15:25:26 +01:00
parent 725ae222a4
commit e212334454
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/kolab_files/kolab_files.js
View file

@ -713,7 +713,6 @@ function kolab_dialog_show(content, params, onopen)
params = $.extend({ params = $.extend({
modal: true, modal: true,
resizable: true, resizable: true,
closeOnEscape: (!bw.ie6 && !bw.ie7), // disabled for performance reasons
minWidth: 400, minWidth: 400,
minHeight: 300, minHeight: 300,
width: 500, width: 500,
@ -736,6 +735,8 @@ function kolab_dialog_show(content, params, onopen)
} }
(elem && elem.length ? elem : window).focus(); (elem && elem.length ? elem : window).focus();
rcmail.ksearch_blur();
}; };
// display it as popup // display it as popup
@ -1228,7 +1229,7 @@ function kolab_files_editors_dialog(session)
// add the given list of participants // add the given list of participants
function kolab_files_add_attendees(names) function kolab_files_add_attendees(names)
{ {
var i, item, email, name, attendees = {}, counter = 0; var i, item, success, email, name, attendees = {}, counter = 0;
names = file_api.explode_quoted_string(names.replace(/,\s*$/, ''), ','); names = file_api.explode_quoted_string(names.replace(/,\s*$/, ''), ',');
@ -1260,6 +1261,8 @@ function kolab_files_add_attendees(names)
} }
} }
success = counter > 0;
// remove already existing entries // remove already existing entries
if (counter) { if (counter) {
if (attendees[rcmail.env.file_data.session.owner]) { if (attendees[rcmail.env.file_data.session.owner]) {
@ -1276,6 +1279,8 @@ function kolab_files_add_attendees(names)
if (counter) if (counter)
file_api.document_invite(rcmail.env.file_data.session.id, attendees); file_api.document_invite(rcmail.env.file_data.session.id, attendees);
return success;
}; };
function kolab_files_attendee_record(user, status) function kolab_files_attendee_record(user, status)
@ -3095,16 +3100,16 @@ function kolab_files_ui()
// document invite response handler // document invite response handler
this.document_invite_response = function(response) this.document_invite_response = function(response)
{ {
if (!this.response(response)) if (!this.response(response) || !response.result)
return; return;
var info = rcmail.env.file_data, var info = rcmail.env.file_data,
table = $('#document-editors-dialog table > tbody'); table = $('#document-editors-dialog table > tbody');
$.each(response.list || {}, function() { $.each(response.result.list || {}, function() {
table.appned(kolab_files_attendee_record(this.user, this.status)); table.append(kolab_files_attendee_record(this.user, this.status));
if (info.session && info.session.invitations) if (info.session && info.session.invitations)
info.session.invitations.push($.merge({status: 'invited'}, this)); info.session.invitations.push($.extend({status: 'invited'}, this));
}); });
}; };