client/views: refactor rendering

4 files changed, 14 insertions, 13 deletions

diff --git a/client/js/controllers/help_controller.js b/client/js/controllers/help_controller.js
index 9ee980d..2cc53a2 100644
--- a/client/js/controllers/help_controller.js
+++ b/client/js/controllers/help_controller.js
@@ -18,7 +18,9 @@ class HelpController {
 
     showHelpRoute(section) {
         topNavController.activate('help');
-        this.helpView.render(section);
+        this.helpView.render({
+            section: section,
+        });
     }
 }
 
diff --git a/client/js/controllers/home_controller.js b/client/js/controllers/home_controller.js
index 1384e15..32144e2 100644
--- a/client/js/controllers/home_controller.js
+++ b/client/js/controllers/home_controller.js
@@ -16,7 +16,7 @@ class HomeController {
 
     indexRoute() {
         topNavController.activate('home');
-        this.homeView.render();
+        this.homeView.render({});
     }
 
     notFoundRoute() {
diff --git a/client/js/controllers/top_nav_controller.js b/client/js/controllers/top_nav_controller.js
index 9ee7f07..4e27395 100644
--- a/client/js/controllers/top_nav_controller.js
+++ b/client/js/controllers/top_nav_controller.js
@@ -32,17 +32,16 @@ class TopNavController {
             'help':     new NavigationItem('E', 'Help',     '/help'),
         };
 
-        events.listen(
-            events.Authentication,
-            () => {
-                this.updateVisibility();
-                this.topNavView.render(this.items, this.activeItem);
-                this.topNavView.activate(this.activeItem);
-            });
+        const rerender = () => {
+            this.updateVisibility();
+            this.topNavView.render({
+                items: this.items,
+                activeItem: this.activeItem});
+            this.topNavView.activate(this.activeItem);
+        };
 
-        this.updateVisibility();
-        this.topNavView.render(this.items, this.activeItem);
-        this.topNavView.activate(this.activeItem);
+        events.listen(events.Authentication, rerender);
+        rerender();
     }
 
     updateVisibility() {
diff --git a/client/js/controllers/users_controller.js b/client/js/controllers/users_controller.js
index eb89b02..8b84d18 100644
--- a/client/js/controllers/users_controller.js
+++ b/client/js/controllers/users_controller.js
@@ -54,7 +54,7 @@ class UsersController {
                 this.user = response.user;
                 next();
             }).catch(response => {
-                this.userView.empty();
+                this.userView.emptyView(this.userView.contentHolder);
                 events.notify(events.Error, response.description);
             });
         }