From 4fc72d64b4e7a41875ef0778597dc3e66741ce8c Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime@quandalle.com>
Date: Fri, 21 Aug 2015 21:20:23 +0200
Subject: Upgrade dependencies

This includes a security fix in mquandalle:bower, and a new package
for useraccounts iron-router templates which forced us to move some
configuration function calls.
---
 client/components/users/router.js     |  7 -------
 client/components/users/userHeader.js | 19 -------------------
 client/config/accounts.js             | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'client')

diff --git a/client/components/users/router.js b/client/components/users/router.js
index 6c3b3429..955f0494 100644
--- a/client/components/users/router.js
+++ b/client/components/users/router.js
@@ -1,10 +1,3 @@
-_.each(['signIn', 'signUp', 'resetPwd', 'forgotPwd', 'enrollAccount'],
-  function(routeName) {
-  AccountsTemplates.configureRoute(routeName, {
-    layoutTemplate: 'userFormsLayout'
-  });
-});
-
 Router.route('/profile/:username', {
   name: 'Profile',
   template: 'profile',
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 234bf9e3..2110faa6 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -33,25 +33,6 @@ Template.editProfilePopup.events({
   }
 });
 
-// We display the form to change the password in a popup window that already
-// have a title, so we unset the title automatically displayed by useraccounts.
-AccountsTemplates.configure({
-  texts: {
-    title: {
-      changePwd: ''
-    }
-  }
-});
-
-AccountsTemplates.configureRoute('changePwd', {
-  redirect: function() {
-    // XXX We should emit a notification once we have a notification system.
-    // Currently the user has no indication that his modification has been
-    // applied.
-    Popup.back();
-  }
-});
-
 // XXX For some reason the useraccounts autofocus isnt working in this case.
 // See https://github.com/meteor-useraccounts/core/issues/384
 Template.changePasswordPopup.onRendered(function() {
diff --git a/client/config/accounts.js b/client/config/accounts.js
index 5e6edd39..e12dd8bc 100644
--- a/client/config/accounts.js
+++ b/client/config/accounts.js
@@ -17,3 +17,29 @@ AccountsTemplates.configure({
     Router.go('Home');
   }
 });
+
+_.each(['signIn', 'signUp', 'resetPwd', 'forgotPwd', 'enrollAccount'],
+  function(routeName) {
+  AccountsTemplates.configureRoute(routeName, {
+    layoutTemplate: 'userFormsLayout'
+  });
+});
+
+// We display the form to change the password in a popup window that already
+// have a title, so we unset the title automatically displayed by useraccounts.
+AccountsTemplates.configure({
+  texts: {
+    title: {
+      changePwd: ''
+    }
+  }
+});
+
+AccountsTemplates.configureRoute('changePwd', {
+  redirect: function() {
+    // XXX We should emit a notification once we have a notification system.
+    // Currently the user has no indication that his modification has been
+    // applied.
+    Popup.back();
+  }
+});
-- 
cgit v1.2.3-1-g7c22