fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript

2 files changed, 2 insertions, 15 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 21157bdfe..6fa4bf78a 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -635,6 +635,7 @@ function updateConvItems(mode,data) {
 	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 	/* autocomplete bbcode */
 	$(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
+	console.log('bla');
 
 	var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; }));
 	var bimgcount = bimgs.length;
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index e3df3ca68..cbc1d8fa1 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -7,21 +7,7 @@ $(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() {
-			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
-			$('#jot-public').hide();
-		});
-		if(selstr === null) {
-			$('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
-			$('#jot-public').show();
-		}
-	}).trigger('change');
-
+	$('textarea').bbco_autocomplete('bbcode');
 	showHideBodyTextarea();
 
 });