From 940c33c42612b68478d8bfc01ce6dc4ca232d09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 11 Mar 2015 13:32:28 -0400
Subject: [PATCH] fix js error removed dupe code

---
 public/src/app.js              |  4 ++--
 public/src/client/chats.js     |  2 +-
 public/src/modules/composer.js | 23 ++---------------------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index d1f6ab93bc..3c47aebf9c 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -537,7 +537,7 @@ app.cacheBuster = null;
 		});
 	};
 
-	function showEmailConfirmWarning() {
+	function showEmailConfirmWarning(err) {
 		if (!config.requireEmailConfirmation || !app.user.uid) {
 			return;
 		}
@@ -555,7 +555,7 @@ app.cacheBuster = null;
 		} else if (!app.user['email:confirmed']) {
 			app.alert({
 				alert_id: 'email_confirm',
-				message: '[[error:email-not-confirmed]]',
+				message: err ? err.message : '[[error:email-not-confirmed]]',
 				type: 'warning',
 				timeout: 0,
 				clickfn: function() {
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 0b0f80ff8c..fe491b49c3 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -207,7 +207,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S,
 			}, function(err) {
 				if (err) {
 					if (err.message === '[[error:email-not-confirmed-chat]]') {
-						return showEmailConfirmAlert(err);
+						return app.showEmailConfirmWarning(err);
 					}
 					return app.alertError(err.message);
 				}
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 3bfb17b31a..d8107e0e33 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -30,7 +30,7 @@ define('composer', [
 				discard(composer.active);
 				return;
 			}
-			
+
 			translator.translate('[[modules:composer.discard]]', function(translated) {
 				bootbox.confirm(translated, function(confirm) {
 					if (confirm) {
@@ -506,7 +506,7 @@ define('composer', [
 			$('.action-bar button').removeAttr('disabled');
 			if (err) {
 				if (err.message === '[[error:email-not-confirmed]]') {
-					return showEmailConfirmAlert(err);
+					return app.showEmailConfirmWarning(err);
 				}
 
 				return app.alertError(err.message);
@@ -519,25 +519,6 @@ define('composer', [
 		}
 	}
 
-	function showEmailConfirmAlert(err) {
-		app.alert({
-			alert_id: 'email_confirm',
-			title: '[[global:alert.error]]',
-			message: err.message,
-			type: 'danger',
-			timeout: 0,
-			clickfn: function() {
-				app.removeAlert('email_confirm');
-				socket.emit('user.emailConfirm', {}, function(err) {
-					if (err) {
-						return app.alertError(err.message);
-					}
-					app.alertSuccess('[[notifications:email-confirm-sent]]');
-				});
-			}
-		});
-	}
-
 	function discard(post_uuid) {
 		if (composer.posts[post_uuid]) {
 			$('#cmp-uuid-' + post_uuid).remove();