summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-08-21 21:20:23 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-08-22 01:05:09 +0200
commit4fc72d64b4e7a41875ef0778597dc3e66741ce8c (patch)
tree767bca35f721c8403be2b33037d0c976637eaf4d /client
parentae4288d5075a98bc141081b3449581ec4f07743f (diff)
downloadwekan-4fc72d64b4e7a41875ef0778597dc3e66741ce8c.tar.gz
wekan-4fc72d64b4e7a41875ef0778597dc3e66741ce8c.tar.bz2
wekan-4fc72d64b4e7a41875ef0778597dc3e66741ce8c.zip
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.
Diffstat (limited to 'client')
-rw-r--r--client/components/users/router.js7
-rw-r--r--client/components/users/userHeader.js19
-rw-r--r--client/config/accounts.js26
3 files changed, 26 insertions, 26 deletions
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();
+ }
+});