Restructured presenters code

public_html/js/Presenters/LoginPresenter.js

@@ -18,12 +18,24 @@ App.Presenters.LoginPresenter = function(
 
 	util.loadTemplate('login-form').then(function(html) {
 		template = _.template(html);
-		render();
+		init();
 	});
 
-	var eventHandlers = {
+	function init() {
+		if (appState.get('loggedIn'))
+			router.navigateToMainPage();
+		else
+			render();
+	}
 
-		loginFormSubmit: function(e) {
+	function render() {
+		$el.html(template());
+		$el.find('form').submit(loginFormSubmitted);
+		$messages = $el.find('.messages');
+		$messages.width($el.find('form').width());
+	};
+
+	function loginFormSubmitted(e) {
 		e.preventDefault();
 		messagePresenter.hideMessages($messages);
 
@@ -40,19 +52,7 @@ App.Presenters.LoginPresenter = function(
 			}).catch(function(response) {
 				messagePresenter.showError($messages, response.json && response.json.error || response);
 			});
-		},
+	}
-
-	};
-
-	if (appState.get('loggedIn'))
-		router.navigateToMainPage();
-
-	function render() {
-		$el.html(template());
-		$el.find('form').submit(eventHandlers.loginFormSubmit);
-		$messages = $el.find('.messages');
-		$messages.width($el.find('form').width());
-	};
 
 	return {
 		render: render,

public_html/js/Presenters/LogoutPresenter.js

@@ -12,22 +12,23 @@ App.Presenters.LogoutPresenter = function(
 
 	var $messages = jQuery('#content');
 
-	var eventHandlers = {
+	init();
-		mainPageLinkClick: function(e) {
-			e.preventDefault();
-			router.navigateToMainPage();
-		},
-	};
 
+	function init() {
 		auth.logout().then(function() {
 			var $messageDiv = messagePresenter.showInfo($messages, 'Logged out. <a href="">Back to main page</a>');
-		$messageDiv.find('a').click(eventHandlers.mainPageLinkClick);
+			$messageDiv.find('a').click(mainPageLinkClicked);
 		}).catch(function(response) {
 			messagePresenter.showError($messages, response.json && response.json.error || response);
 		});
+	}
 
-	return {
+	function mainPageLinkClicked(e) {
-	};
+		e.preventDefault();
+		router.navigateToMainPage();
+	}
+
+	return {};
 
 };
 

public_html/js/Presenters/RegistrationPresenter.js

@@ -15,12 +15,21 @@ App.Presenters.RegistrationPresenter = function(
 
 	util.loadTemplate('registration-form').then(function(html) {
 		template = _.template(html);
-		render();
+		init();
 	});
 
-	var eventHandlers = {
+	function init() {
+		render();
+	}
 
-		registrationFormSubmit: function(e) {
+	function render() {
+		$el.html(template());
+		$el.find('form').submit(registrationFormSubmitted);
+		$messages = $el.find('.messages');
+		$messages.width($el.find('form').width());
+	}
+
+	function registrationFormSubmitted(e) {
 		e.preventDefault();
 		messagePresenter.hideMessages($messages);
 
@@ -36,32 +45,24 @@ App.Presenters.RegistrationPresenter = function(
 
 		api.post('/users', registrationData)
 			.then(function(response) {
-					eventHandlers.registrationSuccess(response);
+				registrationSuccess(response);
 			}).catch(function(response) {
-					eventHandlers.registrationFailure(response);
+				registrationFailure(response);
 			});
-		},
+	}
 
-		registrationSuccess: function(apiResponse) {
+	function registrationSuccess(apiResponse) {
 		//todo: tell user if it turned out that he needs to confirm his e-mail
 		$el.find('form').slideUp(function() {
 			var message = 'Registration complete! ';
 			message += '<a href="#/login">Click here</a> to login.';
 			messagePresenter.showInfo($messages, message);
 		});
-		},
+	}
 
-		registrationFailure: function(apiResponse) {
+	function registrationFailure(apiResponse) {
 		messagePresenter.showError($messages, apiResponse.json && apiResponse.json.error || apiResponse);
-		},
+	}
-	};
-
-	function render() {
-		$el.html(template());
-		$el.find('form').submit(eventHandlers.registrationFormSubmit);
-		$messages = $el.find('.messages');
-		$messages.width($el.find('form').width());
-	};
 
 	function validateRegistrationData(registrationData) {
 		if (registrationData.userName.length == 0) {

public_html/js/Presenters/TopNavigationPresenter.js

@@ -4,21 +4,18 @@ App.Presenters = App.Presenters || {};
 App.Presenters.TopNavigationPresenter = function(util, jQuery, appState) {
 
 	var selectedElement = null;
+	var $el = jQuery('#top-navigation');
 	var template;
 
 	util.loadTemplate('top-navigation').then(function(html) {
 		template = _.template(html);
-		render();
+		init();
 	});
-	var $el = jQuery('#top-navigation');
 
-	var eventHandlers = {
+	function init() {
-		loginStateChanged: function() {
 		render();
-		},
+		appState.startObserving('loggedIn', 'top-navigation', loginStateChanged);
-	};
+	}
-
-	appState.startObserving('loggedIn', 'top-navigation', eventHandlers.loginStateChanged);
 
 	function select(newSelectedElement) {
 		selectedElement = newSelectedElement;
@@ -26,6 +23,10 @@ App.Presenters.TopNavigationPresenter = function(util, jQuery, appState) {
 		$el.find('li.' + selectedElement).addClass('active');
 	};
 
+	function loginStateChanged() {
+		render();
+	}
+
 	function render() {
 		$el.html(template({loggedIn: appState.get('loggedIn')}));
 		$el.find('li.' + selectedElement).addClass('active');

public_html/js/Presenters/UserListPresenter.js

@@ -7,7 +7,11 @@ App.Presenters.UserListPresenter = function(jQuery, topNavigationPresenter, appS
 
 	var $el = jQuery('#content');
 
+	init();
+
+	function init() {
 		render();
+	}
 
 	function render() {
 		$el.html('Logged in: ' + appState.get('loggedIn'));