Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

3 files changed, 9 insertions, 9 deletions

diff --git a/view/js/main.js b/view/js/main.js
index dc40db360..b2210ee4c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -992,7 +992,7 @@ function notify_popup_loader(notifyType) {
 				html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
 				$("#nav-" + notifyType + "-menu").append(html);
 			});
-			$(".dropdown-menu img[data-src]").each(function(i, el){
+			$(".dropdown-menu img[data-src], .dropdown-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");
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index 17b354a4b..e670e1a35 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,7 +1,7 @@
 	$(document).ready(function() {
 //		$("#id_permissions_role").sSelect();
 		$("#id_name").blur(function() {
-			$("#name-spinner").spin('small');
+			$("#name-spinner").show();
 			var zreg_name = $("#id_name").val();
 			$.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
 				$("#id_nickname").val(data);
@@ -9,12 +9,12 @@
 					$("#help_name").html("");
 					zFormError("#help_name",data.error);
 				}
-				$("#name-spinner").spin(false);
+				$("#name-spinner").hide();
 			});
 		});
 
 		$("#id_nickname").blur(function() {
-			$("#nick-spinner").spin('small');
+			$("#nick-spinner").show();
 			var zreg_nick = $("#id_nickname").val();
 			$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
 				$("#id_nickname").val(data);
@@ -22,7 +22,7 @@
 					$("#help_nickname").html("");
 					zFormError("#help_nickname",data.error);
 				}
-				$("#nick-spinner").spin(false);
+				$("#nick-spinner").hide();
 			});
 		});
 
diff --git a/view/js/mod_register.js b/view/js/mod_register.js
index f1f3e7f71..6607579a2 100644
--- a/view/js/mod_register.js
+++ b/view/js/mod_register.js
@@ -28,7 +28,7 @@ $(document).ready(function() {
 	});
 
 	$("#id_name").blur(function() {
-		$("#name-spinner").spin('small');
+		$("#name-spinner").show();
 		var zreg_name = $("#id_name").val();
 		$.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
 			$("#id_nickname").val(data);
@@ -36,12 +36,12 @@ $(document).ready(function() {
 				$("#help_name").html("");
 				zFormError("#help_name",data.error);
 			}
-			$("#name-spinner").spin(false);
+			$("#name-spinner").hide();
 		});
 	});
 
 	$("#id_nickname").blur(function() {
-		$("#nick-spinner").spin('small');
+		$("#nick-spinner").show();
 		var zreg_nick = $("#id_nickname").val();
 		$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
 			$("#id_nickname").val(data);
@@ -49,7 +49,7 @@ $(document).ready(function() {
 				$("#help_nickname").html("");
 				zFormError("#help_nickname",data.error);
 			}
-			$("#nick-spinner").spin(false);
+			$("#nick-spinner").hide();
 		});
 	});