Moved more stuff to appcontroller.

static/js/controllers/appcontroller.js

@@ -23,7 +23,7 @@
 define(["jquery", "angular", "underscore"], function($, angular, _) {
 
 	// AppController
-	return ["$scope", "$window", "appData", "userSettingsData", function($scope, $window, appData, userSettingsData) {
+	return ["$scope", "$window", "appData", "userSettingsData", "$timeout", function($scope, $window, appData, userSettingsData, $timeout) {
 
 		// Disable drag and drop.
 		$($window).on("dragover dragenter drop", function(event) {
@@ -87,6 +87,18 @@ define(["jquery", "angular", "underscore"], function($, angular, _) {
 			$scope.reset();
 		};
 
+		$scope.manualReloadApp = function(url) {
+			appData.flags.manualUnload = true;
+			if (url) {
+				$window.location.href = url;
+				$timeout(function() {
+					appData.flags.manualUnload = false;
+				}, 0);
+			} else {
+				$window.location.reload(true);
+			}
+		};
+
 		$scope.$on("room.joined", function(event, roomName) {
 			if (roomName) {
 				_.pull($scope.roomsHistory, roomName);

static/js/controllers/mediastreamcontroller.js

@@ -25,9 +25,8 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
 	return ["$scope", "$rootScope", "$element", "$window", "$timeout", "safeDisplayName", "safeApply", "mediaStream", "appData", "playSound", "desktopNotify", "alertify", "toastr", "translation", "fileDownload", "localStorage", "screensharing", "localStatus", "dialogs", "rooms", "constraints", function($scope, $rootScope, $element, $window, $timeout, safeDisplayName, safeApply, mediaStream, appData, playSound, desktopNotify, alertify, toastr, translation, fileDownload, localStorage, screensharing, localStatus, dialogs, rooms, constraints) {
 
 		// Avoid accidential reloads or exits when in a call.
-		var manualUnload = false;
 		$($window).on("beforeunload", function(event) {
-			if (manualUnload || !$scope.peer) {
+			if (appData.flags.manualUnload || !$scope.peer) {
 				return;
 			}
 			return translation._("Close this window and disconnect?");
@@ -177,18 +176,6 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
 
 		};
 
-		$scope.manualReloadApp = function(url) {
-			manualUnload = true;
-			if (url) {
-				$window.location.href = url;
-				$timeout(function() {
-					manualUnload = false;
-				}, 0);
-			} else {
-				$window.location.reload(true);
-			}
-		};
-
 		$scope.toggleBuddylist = (function() {
 			var oldState = null;
 			return function(status, force) {