--- a/src/cm/media/js/site/text_edit.js Thu Jan 03 11:07:33 2013 +0100
+++ b/src/cm/media/js/site/text_edit.js Thu Jan 03 11:42:46 2013 +0100
@@ -1,79 +1,22 @@
function check_save(){
- var newVersion = $('#id_new_version').attr('checked') ;
- var commentsKept = $('#id_keep_comments').attr('checked') ;
-
- var new_content = $('#id_content').val() ;
-
- var o=CKEDITOR.instances['id_content'];
- if (o) new_content=o.getData();
-
- var new_format = $('#id_format').val() ;
- var mess = gettext( 'Should these comments be detached (i.e. kept with no scope) or removed from new version?') ;
+ var newVersion = $('#id_new_version').attr('checked') ;
+ var commentsKept = $('#id_keep_comments').attr('checked') ;
- if (commentsKept) {
- var pre_edit_url = tb_conf['pre_edit_url'] ;
- $.ajax({
- url: pre_edit_url,
- type:'POST',
- dataType:"json",
- data: { "new_content": new_content, "new_format": new_format},
- success: function(obj){
- nb_removed = obj['nb_removed'];
- if (newVersion) {
- if (nb_removed == 0) {
- submit_edit_form();
- }
- else {
- var message = ngettext(
- '%(nb_comments)s comment applies to text that was modified.',
- '%(nb_comments)s comments apply to text that was modified.',
- nb_removed) ;
- message += '<br />' ;
- message += mess ;
- message = interpolate(message,{'nb_comments':nb_removed}, true) ;
-
- $('#remove_scope_choice_dlg').html(message) ;
- $('#remove_scope_choice_dlg').dialog('open') ;
- }
- }
- else {
- if (nb_removed == 0) {
- submit_edit_form();
- }
- else {
- var message = ngettext(
- '%(nb_comments)s comment applies to text that was modified.',
- '%(nb_comments)s comments apply to text that was modified.',
- nb_removed) ;
- message += '<br />' ;
- message += gettext( '(We suggest you create a new version)') ;
- message += '<br />' ;
- message += mess ;
- message = interpolate(message,{'nb_comments':nb_removed}, true) ;
-
- $('#remove_scope_choice_dlg').html(message) ;
- $('#remove_scope_choice_dlg').dialog('open') ;
- }
- }
- },
- error: function(msg){
- alert("error: " + msg);
- }
- });
+ if (commentsKept) {
+ submit_edit_form();
+ }
+ else {
+ if (!newVersion) {
+ var message = gettext("You chose not to create a new version all comments will be deleted") ;
+ message += '<br />' ;
+ message += gettext( 'Do you want to continue?') ;
+ $('#confirm_all_removed_dlg').html(message) ;
+ $('#confirm_all_removed_dlg').dialog('open') ;
}
else {
- if (!newVersion) {
-
- var message = gettext("You chose not to create a new version all comments will be deleted") ;
- message += '<br />' ;
- message += gettext( 'Do you want to continue?') ;
- $('#confirm_all_removed_dlg').html(message) ;
- $('#confirm_all_removed_dlg').dialog('open') ;
- }
- else {
- submit_edit_form() ;
- }
+ submit_edit_form() ;
}
+ }
}
function submit_edit_form() {
@@ -90,26 +33,13 @@
$(this).dialog('close');submit_edit_form();
} ;
- $('#confirm_all_removed_dlg').dialog({
- bgiframe: true,
- autoOpen: false,
- title :gettext('Warning'),
- modal: true,
- buttons:buttons
- }) ;
-
- var buttons0 = {};
- buttons0[gettext('Detach')] = function() {$(this).dialog('close');$('#cancel_modified_scopes').val("1");submit_edit_form();} ;
- buttons0[gettext('Remove')] = function() {$(this).dialog('close');$('#cancel_modified_scopes').val("0");submit_edit_form();} ;
- buttons0[gettext('Cancel')] = function() {$(this).dialog('close');} ;
+ $('#confirm_all_removed_dlg').dialog({
+ bgiframe: true,
+ autoOpen: false,
+ title :gettext('Warning'),
+ modal: true,
+ buttons:buttons
+ }) ;
- $('#remove_scope_choice_dlg').dialog({
- bgiframe: true,
- autoOpen: false,
- title :gettext('Warning'),
- modal: true,
- buttons:buttons0
- }) ;
-
- $("#save").click(function() { check_save() ;}) ;
+ $("#save").click(function() { check_save() ;}) ;
}) ;