--- a/src/cm/media/js/site/text_edit.js	Fri Feb 12 21:59:18 2010 +0100
+++ b/src/cm/media/js/site/text_edit.js	Sat Feb 13 11:54:11 2010 +0100
@@ -1,6 +1,4 @@
 function check_save(){
-    needToConfirm = false;
-
     var newVersion = $('#id_new_version').attr('checked') ;
     var commentsKept = $('#id_keep_comments').attr('checked') ;
 
@@ -62,11 +60,12 @@
     }
     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').html(message) ;
-                $('#confirm_all_removed').dialog('open') ;
+    		message += '<br />' ;
+    		message += gettext( 'Do you want to continue?') ;
+            $('#confirm_all_removed_dlg').html(message) ;
+            $('#confirm_all_removed_dlg').dialog('open') ;
         }
         else {
             $('#edit_form').submit();
@@ -76,10 +75,15 @@
 
 $(function() {
 	var buttons = {};
-	buttons[gettext('No')] = function() {$(this).dialog('close');} ;
-	buttons[gettext('Yes')] = function() {$(this).dialog('close');$('#edit_form').submit();} ;
+	buttons[gettext('No')] = function() {
+		$(this).dialog('close');
+	} ;
+	buttons[gettext('Yes')] = function() {
+		needToConfirm = false;
+		$(this).dialog('close');$('#edit_form').submit();
+	} ;	
 
-    $('#confirm_all_removed').dialog({
+    $('#confirm_all_removed_dlg').dialog({
         bgiframe: true, 
         autoOpen: false,        
         title :gettext('Warning'),
@@ -88,8 +92,14 @@
     }) ;
     
 	var buttons0 = {};
-	buttons0[gettext('Detach')] = function() {$(this).dialog('close');$('#cancel_modified_scopes').val("1");$('#edit_form').submit();} ;
-	buttons0[gettext('Remove')] = function() {$(this).dialog('close');$('#cancel_modified_scopes').val("0");$('#edit_form').submit();} ;
+	buttons0[gettext('Detach')] = function() {
+		needToConfirm = false;
+		$(this).dialog('close');$('#cancel_modified_scopes').val("1");$('#edit_form').submit();
+	} ;
+	buttons0[gettext('Remove')] = function() {
+		needToConfirm = false;
+		$(this).dialog('close');$('#cancel_modified_scopes').val("0");$('#edit_form').submit();
+	} ;
 	buttons0[gettext('Cancel')] = function() {$(this).dialog('close');} ;
 
     $('#remove_scope_choice_dlg').dialog({