'; $sm = strtok (trim ($x['message']), "\r\n"); diff --git a/codepot/src/codepot/views/wiki_delete.php b/codepot/src/codepot/views/wiki_delete.php deleted file mode 100644 index fb6e3811..00000000 --- a/codepot/src/codepot/views/wiki_delete.php +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - -<?php print htmlspecialchars($wiki->name)?> - - - - -- - - -load->view ('taskbar'); ?> - - - -load->view ( - 'projectbar', - array ( - 'banner' => NULL, - - 'page' => array ( - 'type' => 'project', - 'id' => 'wiki', - 'project' => $project, - ), - - 'ctxmenuitems' => array () - ) -); -?> - - - -- - - -- -'.htmlspecialchars($message).''; ?> - --id}/".$this->converter->AsciiToHex($wiki->name))?> - -- --- -- - lang->line('MSG_SURE_TO_DELETE_THIS')?> - name)?> - --- projectid))?> - name))?> -- -- lang->line('Delete'))?> -- - -
' + codepot_htmlspecialchars(data) + '', "lang->line('Error')?>"); + } + }, + + error: function (jqXHR, textStatus, errorThrown) { + work_in_progress = false; + show_in_progress_message (null, null); + var errmsg = ''; + if (errmsg == '' && errorThrown != null) errmsg = errorThrown; + if (errmsg == '' && textStatus != null) errmsg = textStatus; + if (errmsg == '') errmsg = 'Unknown error'; + show_alert ('Failed - ' + errmsg, "lang->line('Error')?>"); + } + }); +} + + +function save_wiki_with_confirmation (outputMsg, titleMsg, wiki_new_name, wiki_new_text) +{ + $('#wiki_edit_alert').html(outputMsg).dialog({ + title: titleMsg, + resizable: true, + modal: true, + width: 'auto', + height: 'auto', + buttons: { + "OK": function () { + $(this).dialog("close"); + save_wiki (wiki_new_name, wiki_new_text); + }, + "Cancel": function () { + $(this).dialog("close"); + } + } + }); +} + $(function () { $('#wiki_edit_files').accordion({ collapsible: true, @@ -304,88 +420,21 @@ $(function () { if (!!window.FormData) { // FormData is supported - work_in_progress = true; - show_in_progress_message ('Saving in progress. Please wait...', 'Saving...'); - - wiki_new_name = $('#wiki_edit_name').val(); - wiki_new_text = $('#wiki_edit_text_area').val(); - - var form_data = new FormData(); - - var f_no = 0; - for (var i = 0; i < populated_file_max_for_adding; i++) + var wiki_new_name = $('#wiki_edit_name').val(); + var wiki_new_text = $('#wiki_edit_text_area').val(); + if (populated_file_max_for_adding > cancelled_file_count_for_adding || + killed_file_count > 0 || + wiki_original_name != wiki_new_name || + wiki_original_text != wiki_new_text) { - var f = populated_file_obj_for_adding[i]; - if (f != null) - { - form_data.append ('wiki_file_' + f_no, f); - f_no++; - } + // there are changes. just save the document + save_wiki (wiki_new_name, wiki_new_text); } - form_data.append ('wiki_file_count', f_no); - - f_no = 0; - for (var i = 0; i < original_file_name_array.length; i++) + else { - var n = $('#wiki_edit_file_name_' + i); - if (n) - { - if (n.prop('disabled')) - { - form_data.append ('wiki_kill_file_name_' + f_no, original_file_name_array[i]); - f_no++; - } - } + // no changes detected. + save_wiki_with_confirmation ("lang->line('WIKI_MSG_SAVE_DESPITE_NO_CHANGES?'); ?>", wiki_new_name, wiki_new_name, wiki_new_text); } - form_data.append ('wiki_kill_file_count', f_no); - - form_data.append ('wiki_doctype', $('#wiki_edit_doctype').val()); - form_data.append ('wiki_name', wiki_new_name); - form_data.append ('wiki_original_name', wiki_original_name); - form_data.append ('wiki_text', wiki_new_text); - - $.ajax({ - url: codepot_merge_path('', 'id}"; ?>'), - type: 'POST', - data: form_data, - mimeType: 'multipart/form-data', - contentType: false, - processData: false, - cache: false, - - success: function (data, textStatus, jqXHR) { - work_in_progress = false; - - if (data == 'ok') - { - var name_changed = (wiki_original_name != wiki_new_name); - wiki_original_name = wiki_new_name; - wiki_original_text = wiki_new_text; - update_original_file_name_array (); - show_in_progress_message (null, null); - if (name_changed) - { - // reload the whole page if the name has changed. - $(location).attr ('href', codepot_merge_path('', 'id}/"; ?>' + codepot_string_to_hex(wiki_new_name))); - } - } - else - { - show_in_progress_message (null, null); - show_alert ('
' + codepot_htmlspecialchars(data) + '', "lang->line('Error')?>"); - } - }, - - error: function (jqXHR, textStatus, errorThrown) { - work_in_progress = false; - show_in_progress_message (null, null); - var errmsg = ''; - if (errmsg == '' && errorThrown != null) errmsg = errorThrown; - if (errmsg == '' && textStatus != null) errmsg = textStatus; - if (errmsg == '') errmsg = 'Unknown error'; - show_alert ('Failed - ' + errmsg, "lang->line('Error')?>"); - } - }); } else { @@ -404,8 +453,12 @@ $(function () { }); $(window).on ("beforeunload", function (e) { + var wiki_new_name = $('#wiki_edit_name').val(); var wiki_new_text = $('#wiki_edit_text_area').val(); - if (wiki_original_text != wiki_new_text) + if (populated_file_max_for_adding > cancelled_file_count_for_adding || + killed_file_count > 0 || + wiki_original_name != wiki_new_name || + wiki_original_text != wiki_new_text) { return 'lang->line('MSG_DISCARD_CHANGES?'); ?>'; } diff --git a/codepot/src/codepot/views/wiki_editx.php b/codepot/src/codepot/views/wiki_editx.php index eac45776..25b23919 100644 --- a/codepot/src/codepot/views/wiki_editx.php +++ b/codepot/src/codepot/views/wiki_editx.php @@ -1,4 +1,6 @@ - + + + @@ -77,6 +79,8 @@ function resize_editor() var populated_file_obj_for_adding = []; var populated_file_max_for_adding = 0; +var cancelled_file_count_for_adding = 0; +var killed_file_count = 0; var original_file_name_array = [ name); ?>'; -var wiki_new_name = ''; var wiki_original_text = text); ?>; function show_in_progress_message (outputMsg, titleMsg) @@ -224,6 +234,109 @@ function show_in_progress_message (outputMsg, titleMsg) } } +function save_wiki (wiki_new_name, wiki_new_text) +{ + work_in_progress = true; + show_in_progress_message ('lang->line('WIKI_MSG_SAVE_IN_PROGRESS'); ?>', wiki_new_name); + + var form_data = new FormData(); + + var f_no = 0; + for (var i = 0; i < populated_file_max_for_adding; i++) + { + var f = populated_file_obj_for_adding[i]; + if (f != null) + { + form_data.append ('wiki_file_' + f_no, f); + f_no++; + } + } + form_data.append ('wiki_file_count', f_no); + + f_no = 0; + for (var i = 0; i < original_file_name_array.length; i++) + { + var n = $('#wiki_edit_file_name_' + i); + if (n) + { + if (n.prop('disabled')) + { + form_data.append ('wiki_kill_file_name_' + f_no, original_file_name_array[i]); + f_no++; + } + } + } + form_data.append ('wiki_kill_file_count', f_no); + + form_data.append ('wiki_doctype', 'H'); + form_data.append ('wiki_name', wiki_new_name); + form_data.append ('wiki_original_name', wiki_original_name); + form_data.append ('wiki_text', wiki_new_text); + + $.ajax({ + url: codepot_merge_path('', 'id}"; ?>'), + type: 'POST', + data: form_data, + mimeType: 'multipart/form-data', + contentType: false, + processData: false, + cache: false, + + success: function (data, textStatus, jqXHR) { + work_in_progress = false; + + if (data == 'ok') + { + var name_changed = (wiki_original_name != wiki_new_name); + wiki_original_name = wiki_new_name; + wiki_original_text = wiki_new_text; + update_original_file_name_array (); + show_in_progress_message (null, null); + if (name_changed) + { + // reload the whole page if the name has changed. + $(location).attr ('href', codepot_merge_path('', 'id}/"; ?>' + codepot_string_to_hex(wiki_new_name))); + } + } + else + { + show_in_progress_message (null, null); + show_alert ('
' + codepot_htmlspecialchars(data) + '', "lang->line('Error')?>"); + } + }, + + error: function (jqXHR, textStatus, errorThrown) { + work_in_progress = false; + show_in_progress_message (null, null); + var errmsg = ''; + if (errmsg == '' && errorThrown != null) errmsg = errorThrown; + if (errmsg == '' && textStatus != null) errmsg = textStatus; + if (errmsg == '') errmsg = 'Unknown error'; + show_alert ('Failed - ' + errmsg, "lang->line('Error')?>"); + } + }); +} + +function save_wiki_with_confirmation (outputMsg, titleMsg, wiki_new_name, wiki_new_text) +{ + $('#wiki_edit_alert').html(outputMsg).dialog({ + title: titleMsg, + resizable: true, + modal: true, + width: 'auto', + height: 'auto', + buttons: { + "OK": function () { + $(this).dialog("close"); + save_wiki (wiki_new_name, wiki_new_text); + }, + "Cancel": function () { + $(this).dialog("close"); + } + } + }); +} + $(function () { $('#wiki_edit_files').accordion({ collapsible: true, @@ -288,94 +401,28 @@ $(function () { $("#wiki_edit_save_button").button().click (function() { - var e = wiki_text_editor.serialize(); - if (work_in_progress) return; if (!!window.FormData) { // FormData is supported - work_in_progress = true; - show_in_progress_message ('Saving in progress. Please wait...', 'Saving...'); + var wiki_new_name = $('#wiki_edit_name').val(); + var ed = wiki_text_editor.serialize(); - wiki_new_name = $('#wiki_edit_name').val(); - - var form_data = new FormData(); - - var f_no = 0; - for (var i = 0; i < populated_file_max_for_adding; i++) + var wiki_new_text = $('#wiki_edit_text_area').val(); + if (populated_file_max_for_adding > cancelled_file_count_for_adding || + killed_file_count > 0 || + wiki_original_name != wiki_new_name || + wiki_original_text != ed.wiki_edit_text_editor.value) { - var f = populated_file_obj_for_adding[i]; - if (f != null) - { - form_data.append ('wiki_file_' + f_no, f); - f_no++; - } + // there are changes. just save the document + save_wiki (wiki_new_name, ed.wiki_edit_text_editor.value); } - form_data.append ('wiki_file_count', f_no); - - f_no = 0; - for (var i = 0; i < original_file_name_array.length; i++) + else { - var n = $('#wiki_edit_file_name_' + i); - if (n) - { - if (n.prop('disabled')) - { - form_data.append ('wiki_kill_file_name_' + f_no, original_file_name_array[i]); - f_no++; - } - } + // no changes detected. + save_wiki_with_confirmation ("lang->line('WIKI_MSG_SAVE_DESPITE_NO_CHANGES?'); ?>", wiki_new_name, wiki_new_name, ed.wiki_edit_text_editor.value); } - form_data.append ('wiki_kill_file_count', f_no); - - form_data.append ('wiki_doctype', 'H'); - form_data.append ('wiki_name', wiki_new_name); - form_data.append ('wiki_original_name', wiki_original_name); - form_data.append ('wiki_text', e.wiki_edit_text_editor.value); - - $.ajax({ - url: codepot_merge_path('', 'id}"; ?>'), - type: 'POST', - data: form_data, - mimeType: 'multipart/form-data', - contentType: false, - processData: false, - cache: false, - - success: function (data, textStatus, jqXHR) { - work_in_progress = false; - - if (data == 'ok') - { - var name_changed = (wiki_original_name != wiki_new_name); - wiki_original_name = wiki_new_name; - wiki_original_text = e.wiki_edit_text_editor.value; - update_original_file_name_array (); - show_in_progress_message (null, null); - if (name_changed) - { - // reload the whole page if the name has changed. - $(location).attr ('href', codepot_merge_path('', 'id}/"; ?>' + codepot_string_to_hex(wiki_new_name))); - } - } - else - { - show_in_progress_message (null, null); - show_alert ('
' + codepot_htmlspecialchars(data) + '', "lang->line('Error')?>"); - } - }, - - error: function (jqXHR, textStatus, errorThrown) { - work_in_progress = false; - show_in_progress_message (null, null); - var errmsg = ''; - if (errmsg == '' && errorThrown != null) errmsg = errorThrown; - if (errmsg == '' && textStatus != null) errmsg = textStatus; - if (errmsg == '') errmsg = 'Unknown error'; - show_alert ('Failed - ' + errmsg, "lang->line('Error')?>"); - } - }); } else { @@ -394,8 +441,13 @@ $(function () { }); $(window).on ("beforeunload", function (e) { + var wiki_new_name = $('#wiki_edit_name').val(); var ed = wiki_text_editor.serialize(); - if (wiki_original_text != ed.wiki_edit_text_editor.value) + + if (populated_file_max_for_adding > cancelled_file_count_for_adding || + killed_file_count > 0 || + wiki_original_name != wiki_new_name || + wiki_original_text != ed.wiki_edit_text_editor.value) { return 'lang->line('MSG_DISCARD_CHANGES?'); ?>'; }