--- ajax_comments.js	2009-03-08 20:43:20.000000000 +0100
+++ ajax_comments_mine.js	2009-03-23 18:45:02.000000000 +0100
@@ -4,6 +4,15 @@ var last_submit;
 var speed = 'fast';
 var ahah = false;
 
+// edit munikho
+$(document).ready(function(){
+	$('.indented').hide();
+	$('.comment .read_replies').click(function(){
+		$(this).parent().nextAll('.indented:first').slideToggle('fast');
+	})
+	
+});
+
 /**
  * Attaches the ahah behavior to each ahah form element.
  */
@@ -73,7 +82,8 @@ Drupal.behaviors.ajax_comments = functio
     }
     else {
       $('#comment-form-title', context).addClass('pressed');
-      $('#comment-form-content').attr('cid', 0);
+//edited munikho (fixes placement of base comment form)
+      $('#comment-form-content').attr('cid', -1);
     }
     
     // Attaching event to title link
@@ -146,7 +156,18 @@ function reply_click() {
           $('#comment-form-content').after('<div style="height:' + $('#comment-form-content').height() + 'px;" class="sizer"></div>');
           $('.sizer').slideUp(speed, function(){ $(this).remove(); });
         }
-        $(this).parents(commentbox).after($('#comment-form-content'));
+// edited by munikho (added 2 if statements)
+		if ($(this).parents(commentbox).next().hasClass('indented')){
+	        $(this).parents(commentbox).next().after($('#comment-form-content'));			
+		} else {
+	        $(this).parents(commentbox).after($('#comment-form-content'));						
+		}
+		if ($(this).parents(commentbox).next().hasClass('indented:hidden')){
+			$(this).parents(commentbox).next().show('fast', function(){
+				var offset = $('#comment-form-content').offset();
+		        $('html').animate({scrollTop: offset.top - 200 }, 'slow');							
+			})
+		}
         rows = Drupal.settings.rows_in_reply;
         $('#comment-form-content').prepend($('#comment-preview'));
       }
@@ -166,6 +187,7 @@ function reply_click() {
     $('.last-clicked').removeClass('last-clicked');
     $(this).addClass('last-clicked');
     $('#comment-form-content').attr('cid', link_cid);
+	$(this).parents('.comment').nextAll('.indented:first').show();
   }
   else {
     // handling double click
@@ -365,7 +387,8 @@ function ajax_comments_close_form(reinit
     }
   });
   $('.pressed').removeClass('pressed');
-  $('#comment-form-content').attr('cid', -1);
+  $('.last-clicked').removeClass('last-clicked');
+  $('#comment-form-content').attr('cid', '93')
   ajax_comments_hide_progress();
 }
 
@@ -409,11 +432,12 @@ jQuery.fn.ajaxCommentsSubmitToggle = fun
       if ((offset.top > $('html').scrollTop() + height) || (offset.top < $('html').scrollTop() - 20)) {
         $('html').animate({scrollTop: offset.top - height}, 'slow', function(){
           /// Blink a little bit to user, so he know where's his comment
-          obj.fadeTo('fast', 0.2).fadeTo('fast', 1).fadeTo('fast', 0.5).fadeTo('fast', 1).fadeTo('fast', 0.7).fadeTo('fast', 1, function() { if ($.browser.msie) this.style.removeAttribute('filter'); });
+// edit munikho (deleted blinking)
+          obj.fadeTo('fast', 1, function() { if ($.browser.msie) this.style.removeAttribute('filter'); });
         });
       }
       else {
-        obj.fadeTo('fast', 0.2).fadeTo('fast', 1).fadeTo('fast', 0.5).fadeTo('fast', 1).fadeTo('fast', 0.7).fadeTo('fast', 1, function() { if ($.browser.msie) this.style.removeAttribute('filter'); });
+        obj.fadeTo('fast', 1, function() { if ($.browser.msie) this.style.removeAttribute('filter'); });
       }
       if ($.browser.msie) this.style.removeAttribute('filter');
     });
