Merge remote-tracking branch 'upstream/master'

3 files changed, 16 insertions, 5 deletions

diff --git a/view/js/main.js b/view/js/main.js
index d6b405258..2e297c9d6 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1114,7 +1114,7 @@ $(window).scroll(function () {
 			$('#more').show();
 		}
 
-		if($(window).scrollTop() + $(window).height() == $(document).height()) {
+		if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
 			if((pageHasMoreContent) && (! loadingPage)) {
 				$('#more').hide();
 				$('#no-more').hide();
@@ -1134,7 +1134,7 @@ $(window).scroll(function () {
 			$('#more').show();
 		}
 
-		if($(window).scrollTop() + $(window).height() == $(document).height()) {
+		if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
 			if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
 				$('#more').hide();
 				$('#no-more').hide();
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 6231dbd0c..fabf24e95 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -6,11 +6,18 @@ function abook_perms_msg() {
 }
 
 $(document).ready(function() {
-	if(typeof(after_following) !== 'undefined' && after_following)
-		connectFullShare();
+	if(typeof(after_following) !== 'undefined' && after_following) {
+		if(typeof(connectDefaultShare) !== 'undefined')
+			connectDefaultShare();
+		else
+			connectFullShare();
+	}
 
 	$('#id_pending').click(function() {
-		connectFullShare();
+		if(typeof(connectDefaultShare) !== 'undefined')
+			connectDefaultShare();
+		else
+			connectFullShare();
 	});
 
 	$('.abook-edit-me').click(function() {
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index a3c1dd05c..882da940e 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,16 +1,20 @@
 	$(document).ready(function() {
 		$("#newchannel-name").blur(function() {
+			$("#name-spinner").spin('small');
 			var zreg_name = $("#newchannel-name").val();
 			$.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
 				$("#newchannel-nickname").val(data);
 				zFormError("#newchannel-name-feedback",data.error);
+				$("#name-spinner").spin(false);
 			});
 		});
 		$("#newchannel-nickname").blur(function() {
+			$("#nick-spinner").spin('small');
 			var zreg_nick = $("#newchannel-nickname").val();
 			$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
 				$("#newchannel-nickname").val(data);
 				zFormError("#newchannel-nickname-feedback",data.error);
+				$("#nick-spinner").spin(false);
 			});
 		});