Merge pull request #10 from redmatrix/master

updating from original codebase

3 files changed, 9 insertions, 31 deletions

diff --git a/view/js/acl.js b/view/js/acl.js
index ed8af478a..6d94b4987 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -39,18 +39,18 @@ function ACL(backend_url, preset) {
 // no longer called only on submit - call to update whenever a change occurs to the acl list. 
 
 ACL.prototype.on_submit = function() {
-	aclfileds = $("#acl-fields").html("");
+	aclfields = $("#acl-fields").html("");
 	$(that.allow_gid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
 	$(that.allow_cid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
 	$(that.deny_gid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
 	$(that.deny_cid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
 
 	//areYouSure jquery plugin: recheck the form here
diff --git a/view/js/main.js b/view/js/main.js
index ca7d50b90..d670b704a 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -758,9 +758,9 @@ function pageUpdate() {
 	});
 }
 
-function justifyPhotos() {
+function justifyPhotos(id) {
 	justifiedGalleryActive = true;
-	$('#photo-album-contents').justifiedGallery({
+	$('#' + id).justifiedGallery({
 		selector: '> a, > div:not(.spinner, #page-end)',
 		margins: 3,
 		border: 0,
@@ -775,9 +775,9 @@ function justifyPhotos() {
 	}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
-function justifyPhotosAjax() {
+function justifyPhotosAjax(id) {
 	justifiedGalleryActive = true;
-	$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
+	$('#' + id).justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
 function notify_popup_loader(notifyType) {
diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js
deleted file mode 100644
index e883763df..000000000
--- a/view/js/mod_mitem.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * JavaScript used by mod/mitem.
- */
-$(document).ready(function() {
-	$("a#settings-default-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'elastic'
-	});
-
-	$('#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('icon-unlock').addClass('icon-lock');
-			$('#jot-public').hide();
-		});
-		if(selstr === null) {
-			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
-			$('#jot-public').show();
-		}
-	}).trigger('change');
-});
\ No newline at end of file