Merge pull request #2 from redmatrix/master

Update to latest hubzilla

3 files changed, 26 insertions, 7 deletions

diff --git a/view/js/main.js b/view/js/main.js
index acdc2e5f5..8bd4357cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -836,10 +836,20 @@ function dropItem(url, object) {
 function dosubthread(ident) {
 	unpause();
 	$('#like-rotator-' + ident.toString()).spin('tiny');
-	$.get('subthread/' + ident.toString(), NavUpdate );
+	$.get('subthread/sub/' + ident.toString(), NavUpdate );
 	liking = 1;
 }
 
+
+function dounsubthread(ident) {
+	unpause();
+	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$.get('subthread/unsub/' + ident.toString(), NavUpdate );
+	liking = 1;
+}
+
+
+
 function dostar(ident) {
 	ident = ident.toString();
 	$('#like-rotator-' + ident).spin('tiny');
@@ -1156,7 +1166,6 @@ $(document).ready(function() {
 		numbers       : aStr['t17'],
 	};
 
-	$(".autotime").timeago();
 	$("#toc").toc();
 });
 
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 36b22138f..561df7229 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -2,4 +2,5 @@ $(document).ready(function() {
 	$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
 		$("#recip-complete").val(data.xid);
 	});
+	$(".autotime").timeago()
 }); 
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index b254370c1..d371c3f2f 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -6,10 +6,9 @@
 var ispublic = aStr.everybody;
 
 $(document).ready(function() {
-	$(document).ready(function() {
-		$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
-			$("#photo-edit-newtag").val('@' + data.name);
-		});
+
+	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
+		$("#photo-edit-newtag").val('@' + data.name);
 	});
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
@@ -24,4 +23,14 @@ $(document).ready(function() {
 			$('#jot-public').show();
 		}
 	}).trigger('change');
-});
\ No newline at end of file
+
+	showHideBodyTextarea();
+
+});
+
+function showHideBodyTextarea() {
+	if( $('#id_visible').is(':checked'))
+		$('#body-textarea').slideDown();
+	else
+		$('#body-textarea').slideUp();
+}