e2ee in comments and a bit of cleanup so not every theme has to define how to insert bbcode, only if they're doing something special (e.g. this is how to implement a javascript plugin :-)), and I got rid of the predefined http:// in the bbcode for urls. You're almost always pasting a url which already has that bit and it just creates an extra step.

2 files changed, 13 insertions, 38 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a97e906bf..e40a94fcc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,35 +1,5 @@
 
 
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
 function cmtBbOpen(comment, id) {
 	if($(comment).hasClass('comment-edit-text-full')) {
 		$(".comment-edit-bb-" + id).show();
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 7b6113105..fb08624f2 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -18,28 +18,33 @@
 				<ul class="comment-edit-bb-{{$id}}">
 					<li><i class="icon-bold shadow comment-icon"
 						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','b', {{$id}});"></i></li>
 					<li><i class="icon-italic shadow comment-icon"
 						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','i', {{$id}});"></i></li>
 					<li><i class="icon-underline shadow comment-icon"
 						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','u', {{$id}});"></i></li>
 					<li><i class="icon-quote-left shadow comment-icon"
 						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','quote', {{$id}});"></i></li>
 					<li><i class="icon-terminal shadow comment-icon"
 						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','code', {{$id}});"></i></li>
 					<li><i class="icon-camera shadow comment-icon"
 						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','img', {{$id}});"></i></li>
 					<li><i class="icon-link shadow comment-icon"
 						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','url', {{$id}});"></i></li>
 					<li><i class="icon-facetime-video shadow comment-icon"
 						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></li>
+						onclick="insertbbcomment('{{$comment}}','video', {{$id}});"></i></li>
+					{{if $feature_encrypt}}
+						<li><i class="icon-key shadow comment-icon"
+							style="cursor: pointer;" title="{{$encrypt}}"
+							onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + {{$id}},''); return false;"></i></li>
+					{{/if}}
 				</ul>	
 				<div class="comment-edit-bb-end"></div>
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>