Merge branch 'master' of https://github.com/habeascodice/red

4 files changed, 31 insertions, 7 deletions

diff --git a/view/js/acl.js b/view/js/acl.js
index c129634a0..eb702d2b0 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -17,6 +17,9 @@ function ACL(backend_url, preset){
 	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
 	that.showall = $("#acl-showall");
 
+	// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. 
+	that.on_submit();
+
 	if (preset.length==0) that.showall.removeClass("btn-default").addClass("btn-warning");
 	
 	/*events*/
@@ -26,7 +29,6 @@ function ACL(backend_url, preset){
 		$(document).on('click','.acl-button-show',that.on_button_show);
 		$(document).on('click','.acl-button-hide',that.on_button_hide);
 		$("#acl-search").keypress(that.on_search);
-//		$("#acl-wrapper").parents("form").submit(that.on_submit);
 
 		/* startup! */
 		that.get(0,100);
@@ -269,5 +271,6 @@ ACL.prototype.populate = function(data){
 		$(el).removeAttr("data-src");
 	});
 	that.update_view();
+	$('#dbtn-submit, #dbtn-acl').prop('disabled', false);
 }
 
diff --git a/view/js/main.js b/view/js/main.js
index 32db7ccb7..a55b8fbb1 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -575,7 +575,7 @@ function updateConvItems(mode,data) {
 	}
 
 	/* autocomplete @nicknames */
-	$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+	$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
 	
 	var bimgs = $(".wall-item-body img").not(function() { return this.complete; });
 	var bimgcount = bimgs.length;
@@ -749,7 +749,7 @@ function updateConvItems(mode,data) {
 				$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark);
 
 				$(data.notify).each(function() {
-					html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class);
+					html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
 					$("#nav-" + notifyType + "-menu").append(html);
 				});
 				$(".dropdown-menu img[data-src]").each(function(i, el){
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index aaa86df40..8b7706f16 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -13,6 +13,19 @@ $(document).ready(function() {
 		'transition' : 'elastic' 
 	});
 
+	var a;
+	a = $("#photo-edit-newtag").autocomplete({ 
+		serviceUrl: baseurl + '/acl',
+		minChars: 2,
+		width: 250,
+		id: 'newtag-ac',
+		onSelect: function(value,data) {
+			$("#photo-edit-newtag").val(data);
+		},
+	});
+	a.setOptions({ params: { type: 'p' }});
+
+
 	$('#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_settings.js b/view/js/mod_settings.js
index 77c9d0ced..87c8c3a2b 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -3,10 +3,18 @@ var ispublic = aStr['everybody'] ;
 
 $(document).ready(function() {
 
-			  $("a#settings-default-perms-menu").colorbox({ 
-				  'inline' : true, 
-				  'transition' : 'elastic' 
-			});
+	$("a#settings-default-perms-menu").colorbox({ 
+		'inline' : true, 
+		'transition' : 'elastic' 
+	});
+
+	$("#privacy-role-select").change(function() {
+		var role = $("#privacy-role-select").val();
+		if(role == 'custom')
+			$('#advanced-perm').show();
+		else
+			$('#advanced-perm').hide();
+	});
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;