3 files changed, 84 insertions, 32 deletions

diff --git a/view/js/main.js b/view/js/main.js
index e700c4e6e..d09615f3c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -166,6 +166,12 @@ function handle_comment_form(e) {
 		$('#' + commentElm).addClass('expanded').removeAttr('placeholder');
 		$('#' + commentElm).attr('tabindex','9');
 		$('#' + submitElm).attr('tabindex','10');
+		
+		var commentBody = localStorage.getItem("comment_body");
+		if(commentBody && $('#' + commentElm).val() === '') {
+			$('#' + commentElm).val(commentBody);
+		}
+		
 		form.find(':not(:visible)').show();
 	}
 
@@ -185,6 +191,28 @@ function handle_comment_form(e) {
 			form.find(':not(.comment-edit-text)').hide();
 		}
 	});
+	
+	var commentSaveTimer = null;
+	var emptyCommentElm = form.find('.comment-edit-text').attr('id');
+	$(document).on('focusout','#' + emptyCommentElm,function(e){
+		if(commentSaveTimer)
+			clearTimeout(commentSaveTimer);
+		commentSaveChanges(true);
+		commentSaveTimer = null;
+	});
+
+	$(document).on('focusin','#' + emptyCommentElm,function(e){
+		commentSaveTimer = setTimeout(function () {
+			commentSaveChanges(false);
+		},10000);
+	});
+
+	function commentSaveChanges(isFinal = false, type) {
+		localStorage.setItem("comment_body", $('#' + emptyCommentElm).val());
+		if( !isFinal) {
+			commentSaveTimer = setTimeout(commentSaveChanges,10000);
+		}
+	}
 }
 
 function commentClose(obj, id) {
@@ -1106,6 +1134,7 @@ function post_comment(id) {
 		$("#comment-edit-form-" + id).serialize(),
 		function(data) {
 			if(data.success) {
+				localStorage.removeItem("comment_body");
 				$("#comment-edit-preview-" + id).hide();
 				$("#comment-edit-wrapper-" + id).hide();
 				$("#comment-edit-text-" + id).val('');
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index c1dab52d5..2b4284ade 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -560,3 +560,58 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 	}
 });
 </script>
+
+
+<script>
+
+	var postSaveTimer = null;
+
+	$(document).on('focusout',"#profile-jot-wrapper",function(e){
+		if(postSaveTimer)
+			clearTimeout(postSaveTimer);
+		postSaveChanges(true);
+		postSaveTimer = null;
+	});
+
+	$(document).on('focusin',"#profile-jot-wrapper",function(e){
+		postSaveTimer = setTimeout(function () {
+			postSaveChanges(false);
+		},10000);
+	});
+
+	function postSaveChanges(isFinal = false, type) {
+		localStorage.setItem("post_title", $("#jot-title").val());
+		localStorage.setItem("post_body", $("#profile-jot-text").val());
+		localStorage.setItem("post_category", $("#jot-category").val());
+		if( !isFinal) {
+			postSaveTimer = setTimeout(postSaveChanges,10000);
+		}
+
+	}
+
+	$(document).ready(function() {
+		var postTitle = localStorage.getItem("post_title");
+		var postBody = localStorage.getItem("post_body");
+		var postCategory = localStorage.getItem("post_category");
+		var openEditor = false;
+		if(postTitle) {
+			$('#jot-title').val(postTitle);
+			openEditor = true;
+		}
+		if(postBody) {
+			$('#profile-jot-text').val(postBody);
+			openEditor = true;
+		}
+		if(postCategory) {
+			var categories = postCategory.split(',');
+			categories.forEach(function(cat) {
+				$('#jot-category').tagsinput('add', cat);
+			});
+			openEditor = true;
+		}
+		if(openEditor) {
+			initEditor();
+		}
+	});
+
+</script>
\ No newline at end of file
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 90058ab30..bc9339d4c 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -40,38 +40,6 @@
 			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
 		{{/if}}
-
-		<script>
-
-			var postSaveTimer = null;
-
-			$(document).on('focusout',"#profile-jot-text",function(e){
-				if(postSaveTimer)
-					clearTimeout(postSaveTimer);
-				postSaveChanges(true);
-				postSaveTimer = null;
-			});
-
-			$(document).on('focusin',"#profile-jot-text",function(e){
-				postSaveTimer = setTimeout(function () {
-					postSaveChanges(false);
-				},10000);
-			});
-
-			function postSaveChanges(isFinal = false, type) {
-				$.post('autosavetext', 
-					{ 
-						'type' : 'post', 
-						'body' : $("#profile-jot-text").val(),
-						'title': $("#jot-title").val()
-					}
-				);
-				if( !isFinal) {
-					postSaveTimer = setTimeout(postSaveChanges,10000);
-				}
-				
-			}
-		</script>
 		<div id="jot-text-wrap">
 			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
 		</div>