Merge pull request #931 from dawnbreak/master

Some JavaScript cleanups.

1 files changed, 97 insertions, 105 deletions

diff --git a/view/js/acl.js b/view/js/acl.js
index 152ff6490..626d1a750 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -1,18 +1,18 @@
-function ACL(backend_url, preset){
+function ACL(backend_url, preset) {
 	that = this;
-	
+
 	that.url = backend_url;
-	
+
 	that.kp_timer = null;
-	
-	if (preset==undefined) preset = [];
+
+	if (preset === undefined) preset = [];
 	that.allow_cid = (preset[0] || []);
 	that.allow_gid = (preset[1] || []);
 	that.deny_cid  = (preset[2] || []);
 	that.deny_gid  = (preset[3] || []);
 	that.group_uids = [];
 	that.nw = 4; //items per row. should be calulated from #acl-list.width
-	
+
 	that.list_content = $("#acl-list-content");
 	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
 	that.showall = $("#acl-showall");
@@ -20,8 +20,8 @@ function ACL(backend_url, preset){
 	// 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");
-	
+	if (preset.length === 0) that.showall.removeClass("btn-default").addClass("btn-warning");
+
 	/*events*/
 
 	$(document).ready(function() {
@@ -36,66 +36,63 @@ function ACL(backend_url, preset){
 			that.on_submit();
 //		}, 5000 );
 	});
-
 }
 
 // no longer called on submit - call to update whenever a change occurs to the acl list. 
 
-ACL.prototype.on_submit = function(){
+ACL.prototype.on_submit = function() {
 	aclfileds = $("#acl-fields").html("");
-	$(that.allow_gid).each(function(i,v){
+	$(that.allow_gid).each(function(i,v) {
 		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
-	$(that.allow_cid).each(function(i,v){
+	$(that.allow_cid).each(function(i,v) {
 		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
-	$(that.deny_gid).each(function(i,v){
+	$(that.deny_gid).each(function(i,v) {
 		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
-	$(that.deny_cid).each(function(i,v){
+	$(that.deny_cid).each(function(i,v) {
 		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
-//	alert(aclfileds);
 
 	//areYouSure jquery plugin: recheck the form here
 	$('form').trigger('checkform.areYouSure');
+};
 
-}
-
-ACL.prototype.search = function(){
+ACL.prototype.search = function() {
 	var srcstr = $("#acl-search").val();
 	that.list_content.html("");
-	that.get(0,100, srcstr);
-}
+	that.get(0, 100, srcstr);
+};
 
-ACL.prototype.on_search = function(event){
+ACL.prototype.on_search = function(event) {
 	if (that.kp_timer) clearTimeout(that.kp_timer);
 	that.kp_timer = setTimeout( that.search, 1000);
-}
+};
 
-ACL.prototype.on_showall = function(event){
-	event.preventDefault()
+ACL.prototype.on_showall = function(event) {
+	event.preventDefault();
 	event.stopPropagation();
-	
-	if (that.showall.hasClass("btn-warning")){
+
+	if (that.showall.hasClass("btn-warning")) {
 		return false;
 	}
 	that.showall.removeClass("btn-default").addClass("btn-warning");
-	
+
 	that.allow_cid = [];
 	that.allow_gid = [];
 	that.deny_cid  = [];
 	that.deny_gid  = [];
-	
+
 	that.update_view();
 	that.on_submit();
-	
+
 	return false;
-}
+};
 
-ACL.prototype.on_button_show = function(event){
-	event.preventDefault()
-	event.stopImmediatePropagation()
+ACL.prototype.on_button_show = function(event) {
+	event.preventDefault();
+	event.stopImmediatePropagation();
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
@@ -104,11 +101,13 @@ ACL.prototype.on_button_show = function(event){
 
 	that.set_allow($(this).parent().attr('id'));
 	that.on_submit();
+
 	return false;
-}
-ACL.prototype.on_button_hide = function(event){
-	event.preventDefault()
-	event.stopImmediatePropagation()
+};
+
+ACL.prototype.on_button_hide = function(event) {
+	event.preventDefault();
+	event.stopImmediatePropagation();
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
@@ -117,48 +116,49 @@ ACL.prototype.on_button_hide = function(event){
 
 	that.set_deny($(this).parent().attr('id'));
 	that.on_submit();
+
 	return false;
-}
+};
 
-ACL.prototype.set_allow = function(itemid){
+ACL.prototype.set_allow = function(itemid) {
 	type = itemid[0];
-	id 	 = itemid.substr(1);
-	switch(type){
+	id   = itemid.substr(1);
+	switch(type) {
 		case "g":
-			if (that.allow_gid.indexOf(id)<0){
-				that.allow_gid.push(id)
+			if (that.allow_gid.indexOf(id)<0) {
+				that.allow_gid.push(id);
 			}else {
 				that.allow_gid.remove(id);
 			}
 			if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
 			break;
 		case "c":
-			if (that.allow_cid.indexOf(id)<0){
-				that.allow_cid.push(id)
+			if (that.allow_cid.indexOf(id)<0) {
+				that.allow_cid.push(id);
 			} else {
 				that.allow_cid.remove(id);
 			}
-			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);			
+			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
 			break;
 	}
 	that.update_view();
-}
+};
 
-ACL.prototype.set_deny = function(itemid){
+ACL.prototype.set_deny = function(itemid) {
 	type = itemid[0];
-	id 	 = itemid.substr(1);
-	switch(type){
+	id   = itemid.substr(1);
+	switch(type) {
 		case "g":
-			if (that.deny_gid.indexOf(id)<0){
-				that.deny_gid.push(id)
+			if (that.deny_gid.indexOf(id)<0) {
+				that.deny_gid.push(id);
 			} else {
 				that.deny_gid.remove(id);
 			}
 			if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
 			break;
 		case "c":
-			if (that.deny_cid.indexOf(id)<0){
-				that.deny_cid.push(id)
+			if (that.deny_cid.indexOf(id)<0) {
+				that.deny_cid.push(id);
 			} else {
 				that.deny_cid.remove(id);
 			}
@@ -166,67 +166,63 @@ ACL.prototype.set_deny = function(itemid){
 			break;
 	}
 	that.update_view();
-}
+};
 
-ACL.prototype.update_view = function(){
-	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
-		that.deny_gid.length==0 && that.deny_cid.length==0){
+ACL.prototype.update_view = function() {
+	if (that.allow_gid.length === 0 && that.allow_cid.length === 0 &&
+		that.deny_gid.length === 0 && that.deny_cid.length === 0) {
 			that.showall.removeClass("btn-default").addClass("btn-warning");
 			/* jot acl */
-				$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);			
-				if(typeof editor != 'undefined' && editor != false) {
-					$('#profile-jot-desc').html(ispublic);
-				}
-			
+			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+			$('#jot-public').show();
+			$('.profile-jot-net input').attr('disabled', false);
+			if(typeof editor !== 'undefined' && editor !== false) {
+				$('#profile-jot-desc').html(ispublic);
+			}
 	} else {
-			that.showall.removeClass("btn-warning").addClass("btn-default");
-			/* jot acl */
-				$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');			
-				$('#profile-jot-desc').html('&nbsp;');
+		that.showall.removeClass("btn-warning").addClass("btn-default");
+		/* jot acl */
+		$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+		$('#jot-public').hide();
+		$('.profile-jot-net input').attr('disabled', 'disabled');
+		$('#profile-jot-desc').html('&nbsp;');
 	}
-	$("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function() {
 		$(this).removeClass("groupshow grouphide");
 	});
-	
-	$("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function() {
 		itemid = $(this).attr('id');
 		type = itemid[0];
-		id 	 = itemid.substr(1);
-		
+		id   = itemid.substr(1);
+
 		btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-default");
 		bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-default");
-		
-		switch(type){
+
+		switch(type) {
 			case "g":
 				var uclass = "";
-				if (that.allow_gid.indexOf(id)>=0){
+				if (that.allow_gid.indexOf(id)>=0) {
 					btshow.removeClass("btn-default").addClass("btn-success");
 					bthide.removeClass("btn-danger").addClass("btn-default");
 					uclass="groupshow";
 				}
-				if (that.deny_gid.indexOf(id)>=0){
+				if (that.deny_gid.indexOf(id)>=0) {
 					btshow.removeClass("btn-success").addClass("btn-default");
 					bthide.removeClass("btn-default").addClass("btn-danger");
-					uclass="grouphide";
+					uclass = "grouphide";
 				}
-				
-				$(that.group_uids[id]).each(function(i,v) {
+				$(that.group_uids[id]).each(function(i, v) {
 					if(uclass == "grouphide")
 						$("#c"+v).removeClass("groupshow");
-					if(uclass != "") {
+					if(uclass !== "") {
 						var cls = $("#c"+v).attr('class');
-						if( cls == undefined)
+						if( cls === undefined)
 							return true;
 						var hiding = cls.indexOf('grouphide');
 						if(hiding == -1)
 							$("#c"+v).addClass(uclass);
 					}
 				});
-				
 				break;
 			case "c":
 				if (that.allow_cid.indexOf(id)>=0){
@@ -236,45 +232,41 @@ ACL.prototype.update_view = function(){
 				if (that.deny_cid.indexOf(id)>=0){
 					btshow.removeClass("btn-success").addClass("btn-default");
 					bthide.removeClass("btn-default").addClass("btn-danger");
-				}			
+				}
 		}
-		
 	});
-	
-}
+};
 
-
-ACL.prototype.get = function(start,count, search){
+ACL.prototype.get = function(start, count, search) {
 	var postdata = {
-		start:start,
-		count:count,
-		search:search,
-	}
-	
+		start: start,
+		count: count,
+		search: search,
+	};
+
 	$.ajax({
-		type:'POST',
+		type: 'POST',
 		url: that.url,
 		data: postdata,
 		dataType: 'json',
-		success:that.populate
+		success: that.populate
 	});
-}
+};
 
-ACL.prototype.populate = function(data){
+ACL.prototype.populate = function(data) {
 	var height = Math.ceil(data.items.length / that.nw) * 42;
 	that.list_content.height(height);
 	$(data.items).each(function(){
 		html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
 		html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
-		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
+		if (this.uids !== undefined) that.group_uids[this.id] = this.uids;
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el){
+	$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) {
 		// Replace data-src attribute with src attribute for every image
 		$(el).attr('src', $(el).data("src"));
 		$(el).removeAttr("data-src");
 	});
 	that.update_view();
-}
-
+};
\ No newline at end of file