Merge remote-tracking branch 'mike/master' into dev

1 files changed, 36 insertions, 15 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 6493d2f0f..7ef373b66 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -168,15 +168,6 @@ function handle_comment_form(e) {
 		$('#' + commentElm).attr('tabindex','9');
 		$('#' + submitElm).attr('tabindex','10');
 		
-		if(auto_save_draft) {
-			var commentBody = localStorage.getItem("comment_body");
-			if(commentBody && $('#' + commentElm).val() === '') {
-				$('#' + commentElm).val(commentBody);
-			}
-		} else {
-			localStorage.removeItem("comment_body");
-		}
-		
 		form.find(':not(:visible)').show();
 	}
 
@@ -199,24 +190,31 @@ function handle_comment_form(e) {
 	
 	var commentSaveTimer = null;
 	var emptyCommentElm = form.find('.comment-edit-text').attr('id');
+	var convId = emptyCommentElm.replace('comment-edit-text-','');
 	$(document).on('focusout','#' + emptyCommentElm,function(e){
 		if(commentSaveTimer)
 			clearTimeout(commentSaveTimer);
-		commentSaveChanges(true);
+		commentSaveChanges(convId,true);
 		commentSaveTimer = null;
 	});
 
 	$(document).on('focusin','#' + emptyCommentElm,function(e){
 		commentSaveTimer = setTimeout(function () {
-			commentSaveChanges(false);
+			commentSaveChanges(convId,false);
 		},10000);
 	});
 
-	function commentSaveChanges(isFinal = false) {
+	function commentSaveChanges(convId,isFinal = false) {
 		if(auto_save_draft) {
-			localStorage.setItem("comment_body", $('#' + emptyCommentElm).val());
+			tmp = $('#' + emptyCommentElm).val();
+			if(tmp) {
+				localStorage.setItem("comment_body-" + convId, tmp);
+			}
+			else {
+				localStorage.removeItem("comment_body-" + convId);
+			}
 			if( !isFinal) {
-				commentSaveTimer = setTimeout(commentSaveChanges,10000);
+				commentSaveTimer = setTimeout(commentSaveChanges,10000,convId);
 			}
 		}
 	}
@@ -600,8 +598,10 @@ function updateConvItems(mode,data) {
 	$('.thread-wrapper.toplevel_item',data).each(function() {
 
 		var ident = $(this).attr('id');
-
+		var convId = ident.replace('thread-wrapper-','');
 		var commentWrap = $('#'+ident+' .collapsed-comments').attr('id');
+
+
 		var itmId = 0;
 		var isVisible = false;
 
@@ -612,6 +612,9 @@ function updateConvItems(mode,data) {
 		if($('#collapsed-comments-'+itmId).is(':visible'))
 			isVisible = true;
 
+
+
+
 		// insert the content according to the mode and first_page 
 		// and whether or not the content exists already (overwrite it)
 
@@ -633,6 +636,24 @@ function updateConvItems(mode,data) {
 		if(isVisible)
 			showHideComments(itmId);
 
+		var commentBody = localStorage.getItem("comment_body-" + convId);
+
+		if(commentBody) {
+			var commentElm = $('#comment-edit-text-' + convId);
+			if(auto_save_draft) {
+				if($(commentElm).val() === '') {
+					$('#comment-edit-form-' + convId).show();
+					$(commentElm).addClass("expanded");
+					openMenu("comment-tools-" + convId);
+					$(commentElm).val(commentBody);
+				}
+			} else {
+				localStorage.removeItem("comment_body-" + convId);
+			}
+		}
+
+
+
 		// trigger the autotime function on all newly created content
 
 		$("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago();