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

Apply dialog decision when dragging a yet unsaved note to another list (#3516)

Browse source
This commit is contained in:
Thomas Bruederli 2014-11-04 19:01:53 +01:00
parent 1eed6b74c9
commit 52da8302cb
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/kolab_notes/notes.js
View file

@ -219,9 +219,28 @@ function rcube_kolab_notes_ui(settings)
// move dragged notes to this folder
if (folder_drop_target) {
noteslist.draglayer.hide();
move_notes(folder_drop_target);
noteslist.clear_selection();
reset_view();
// check unsaved changes first
var new_folder_id = folder_drop_target;
warn_unsaved_changes(
// ok
function() {
move_notes(new_folder_id);
reset_view();
noteslist.clear_selection();
},
// nok
undefined,
// beforesave
function(savedata) {
savedata.list = new_folder_id;
// remove from list and thus avoid being moved (again)
var id = me.selected_note.id;
noteslist.remove_row(id);
delete notesdata[id];
}
);
}
folder_drop_target = null;
})
@ -1094,7 +1113,7 @@ function rcube_kolab_notes_ui(settings)
{
data.id = rcmail.html_identifier_encode(data.uid);
var row, is_new = notesdata[data.id] == undefined
var row, is_new = (notesdata[data.id] == undefined && data.list == me.selected_list);
notesdata[data.id] = data;
if (is_new || me.selected_note && data.id == me.selected_note.id) {
@ -1142,7 +1161,7 @@ function rcube_kolab_notes_ui(settings)
/**
* Collect data from the edit form and submit it to the server
*/
function save_note()
function save_note(beforesave)
{
if (!me.selected_note) {
return false;
@ -1150,6 +1169,11 @@ function rcube_kolab_notes_ui(settings)
var savedata = get_save_data();
// run savedata through the given callback function
if (typeof beforesave == 'function') {
beforesave(savedata);
}
// add reference to old list if changed
if (me.selected_note.list && savedata.list != me.selected_note.list) {
savedata._fromlist = me.selected_note.list;
@ -1227,7 +1251,7 @@ function rcube_kolab_notes_ui(settings)
/**
* Check for unsaved changes and warn the user
*/
function warn_unsaved_changes(ok, nok)
function warn_unsaved_changes(ok, nok, beforesave)
{
if (typeof ok != 'function')
ok = function(){ };
@ -1248,8 +1272,9 @@ function rcube_kolab_notes_ui(settings)
buttons.push({
text: rcmail.gettext('save'),
click: function() {
save_note();
save_note(beforesave);
dialog.dialog('close');
rcmail.busy = false; // don't block next action
ok();
}
});