6 files changed, 16 insertions, 3 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 0ba291004..a4a1fdf51 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -269,7 +269,14 @@ function string2bb(element) {
 		}
 
 		if(type=='comanche') {
-			var open_close_elements = ['region', 'widget', 'var', 'template', 'css', 'js'];
+			var open_close_elements = ['region', 'layout', 'template', 'theme', 'widget', 'block', 'menu', 'var', 'css', 'js', 'authored', 'comment', 'webpage'];
+			var open_elements = [];
+
+			var elements = open_close_elements.concat(open_elements);
+		}
+
+		if(type=='comanche-block') {
+			var open_close_elements = ['menu', 'var'];
 			var open_elements = [];
 
 			var elements = open_close_elements.concat(open_elements);
diff --git a/view/js/mod_chat.js b/view/js/mod_chat.js
index 0d47e3e77..f9d2a599c 100644
--- a/view/js/mod_chat.js
+++ b/view/js/mod_chat.js
@@ -15,4 +15,7 @@ $(document).ready(function() {
 			$('#jot-public').show();
 		}
 	}).trigger('change');
+
+	$('#chatText').bbco_autocomplete('bbcode');
+
 });
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index 0b7b3d24c..74b811dd6 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -3,9 +3,8 @@
  */
 
 $(document).ready( function() {
-
 	enableDisableFinishDate();
-
+	$('#comment-edit-text-desc, #comment-edit-text-loc').bbco_autocomplete('bbcode');
 });
 
 function enableDisableFinishDate() {
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 561df7229..3e55c8aeb 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -3,4 +3,5 @@ $(document).ready(function() {
 		$("#recip-complete").val(data.xid);
 	});
 	$(".autotime").timeago()
+	$('#prvmail-text').bbco_autocomplete('bbcode');
 }); 
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index d371c3f2f..34e2e3f25 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -11,6 +11,8 @@ $(document).ready(function() {
 		$("#photo-edit-newtag").val('@' + data.name);
 	});
 
+	$('#id_body').bbco_autocomplete('bbcode');
+
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
diff --git a/view/js/mod_profiles.js b/view/js/mod_profiles.js
index aad2ca902..a7754e0c5 100644
--- a/view/js/mod_profiles.js
+++ b/view/js/mod_profiles.js
@@ -1,3 +1,4 @@
 $(document).ready(function() {
 	$('form').areYouSure(); // Warn user about unsaved settings
+	$('textarea').bbco_autocomplete('bbcode');
 });