From e22e823e93756fbfbb175f4f9f182aee64c1f5b1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 2 Aug 2011 22:39:35 -0700
Subject: allow group selection from contact edit page

---
 include/main.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'include/main.js')

diff --git a/include/main.js b/include/main.js
index d17d923e4..e5c78a065 100644
--- a/include/main.js
+++ b/include/main.js
@@ -341,6 +341,14 @@
 		});
 	}
 
+	function contactgroupChangeMember(gid,cid) {
+		$('body').css('cursor', 'wait');
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
+				$('body').css('cursor', 'auto');				
+		});
+	}
+
+
 function checkboxhighlight(box) {
   if($(box).is(':checked')) {
 	$(box).addClass('checkeditem');
-- 
cgit v1.2.3


From 684ebd2ed8a2b225860b59256bf81146b1867d6a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 10 Aug 2011 21:06:35 -0700
Subject: enhance random_string, block public email replies

---
 include/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/main.js')

diff --git a/include/main.js b/include/main.js
index e5c78a065..6db1f4179 100644
--- a/include/main.js
+++ b/include/main.js
@@ -344,7 +344,7 @@
 	function contactgroupChangeMember(gid,cid) {
 		$('body').css('cursor', 'wait');
 		$.get('contactgroup/' + gid + '/' + cid, function(data) {
-				$('body').css('cursor', 'auto');				
+				$('body').css('cursor', 'auto');
 		});
 	}
 
@@ -402,3 +402,4 @@ Array.prototype.remove = function(item) {
   this.length = from < 0 ? this.length + from : from;
   return this.push.apply(this, rest);
 };
+
-- 
cgit v1.2.3


From 3f61f9f2c56a13170c03610665727b5ec17c841b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 10 Aug 2011 22:20:59 -0700
Subject: comment box premature close due to race condition with liveupdate

---
 include/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/main.js')

diff --git a/include/main.js b/include/main.js
index 6db1f4179..d59c99223 100644
--- a/include/main.js
+++ b/include/main.js
@@ -174,7 +174,8 @@
 				else { 
 
 					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
+						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
 					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
 					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
-- 
cgit v1.2.3