From 80c4c2e3c2eabd1ad367e9e1a977a32604839abe Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Fri, 7 Sep 2018 00:05:25 +0200
Subject: [PATCH] Drop dead code & move some code outside of legacy.js to
 app.js

---
 js/devel/app.js    | 18 ++++++++++++++++++
 js/devel/legacy.js | 28 ++++------------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/js/devel/app.js b/js/devel/app.js
index 3720029..818c7dd 100644
--- a/js/devel/app.js
+++ b/js/devel/app.js
@@ -77,3 +77,21 @@ var ContactRenderer = {
 };
 
 Vue.filter('firstCharacter', ContactRenderer.generateFirstCharacter);
+
+$.urlParam = function (name) {
+	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+	if (results == null) {
+		return null;
+	}
+	else {
+		return results[1] || 0;
+	}
+};
+
+(function ($, OC) {
+	// reset count and title
+	window.onfocus = function () {
+		Sms.unreadCountCurrentConv = 0;
+		document.title = Sms.originalTitle;
+	};
+})(jQuery, OC);
\ No newline at end of file
diff --git a/js/devel/legacy.js b/js/devel/legacy.js
index 4833b45..2b36862 100644
--- a/js/devel/legacy.js
+++ b/js/devel/legacy.js
@@ -12,21 +12,18 @@ var app = angular.module('OcSms', []);
 
 app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile',
 	function ($scope, $interval, $timeout, $compile) {
-		$scope.lastConvMessageDate = 0;
 		$scope.buttons = [
 			{text: "Send"}
 		];
 
-		$scope.messages = [];
 		$scope.totalMessageCount = 0;
-		$scope.selectedContact = {};
 		$scope.lastSearch = '';
 
 		$scope.refreshConversation = function () {
 			$.getJSON(Sms.generateURL('/ocsms/front-api/v1/conversation'),
 				{
-					'phoneNumber': $scope.selectedContact.nav,
-					"lastDate": $scope.lastConvMessageDate
+					'phoneNumber': Conversation.selectedContact.nav,
+					"lastDate": Conversation.lastConvMessageDate
 				},
 				function (jsondata, status) {
 					var fmt = $scope.formatConversation(jsondata);
@@ -37,7 +34,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 						if (document.hasFocus() === false) {
 							Sms.unreadCountCurrentConv += parseInt(fmt[0]);
 							document.title = Sms.originalTitle + " (" + Sms.unreadCountCurrentConv + ")";
-							SmsNotifications.notify(Sms.unreadCountCurrentConv + " unread message(s) in conversation with " + $scope.selectedContact.label);
+							SmsNotifications.notify(Sms.unreadCountCurrentConv + " unread message(s) in conversation with " + Conversation.selectedContact.label);
 						}
 
 					}
@@ -84,7 +81,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 							bufferedContacts.push(peerLabel);
 
 							// Re-set conversation because we reload the element
-							if (id === $scope.selectedContact.nav) {
+							if (id === Conversation.selectedContact.nav) {
 								Sms.selectConversation($("a[mailbox-navigation='" + id + "']"));
 							}
 
@@ -142,21 +139,4 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 	}
 ]);
 
-$.urlParam = function (name) {
-	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
-	if (results == null) {
-		return null;
-	}
-	else {
-		return results[1] || 0;
-	}
-};
-
-(function ($, OC) {
-	// reset count and title
-	window.onfocus = function () {
-		Sms.unreadCountCurrentConv = 0;
-		document.title = Sms.originalTitle;
-	};
-})(jQuery, OC);