From 4fc72d64b4e7a41875ef0778597dc3e66741ce8c Mon Sep 17 00:00:00 2001 From: Maxime Quandalle 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. --- .meteor/packages | 1 + .meteor/versions | 28 ++++++++++++++++------------ client/components/users/router.js | 7 ------- client/components/users/userHeader.js | 19 ------------------- client/config/accounts.js | 26 ++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index dd4f409e..f983802f 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -14,6 +14,7 @@ kenton:accounts-sandstorm service-configuration useraccounts:core useraccounts:unstyled +useraccounts:iron-routing # Compilers mquandalle:jade diff --git a/.meteor/versions b/.meteor/versions index 58e12ef6..b7123682 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -36,7 +36,7 @@ deps@1.0.7 ejson@1.0.6 email@1.0.6 fastclick@1.0.3 -fortawesome:fontawesome@4.3.0 +fortawesome:fontawesome@4.4.0 geojson-utils@1.0.3 html-tools@1.0.4 htmljs@1.0.4 @@ -53,17 +53,20 @@ iron:router@1.0.9 iron:url@1.0.9 jquery@1.11.3_2 json@1.0.3 -kenton:accounts-sandstorm@0.1.3 +kenton:accounts-sandstorm@0.1.4 launch-screen@1.0.2 less@1.0.14 livedata@1.0.13 localstorage@1.0.3 logging@1.0.7 -matb33:collection-hooks@0.7.13 -matteodem:easy-search@1.5.6 +matb33:collection-hooks@0.7.14 +matteodem:easy-search@1.6.2 meteor@1.1.6 meteor-platform@1.2.2 -meteorhacks:subs-manager@1.4.0 +meteorhacks:aggregate@1.2.1 +meteorhacks:collection-utils@1.2.0 +meteorhacks:subs-manager@1.5.2 +meteorspark:util@0.2.0 minifiers@1.1.5 minimongo@1.0.8 mobile-status-bar@1.0.3 @@ -71,7 +74,7 @@ mongo@1.1.0 mongo-livedata@1.0.8 mousetrap:mousetrap@1.4.6_1 mquandalle:autofocus@1.0.0 -mquandalle:bower@1.4.1 +mquandalle:bower@1.4.1_3 mquandalle:jade@0.4.3 mquandalle:jade-compiler@0.4.3 mquandalle:jquery-textcomplete@0.3.9_1 @@ -84,16 +87,16 @@ ongoworks:speakingurl@1.1.0 ordered-dict@1.0.3 peerlibrary:assert@0.2.5 peerlibrary:base-component@0.10.0 -peerlibrary:blaze-components@0.12.0 +peerlibrary:blaze-components@0.13.0 perak:markdown@1.0.5 -raix:eventemitter@0.1.2 +raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.4 random@1.0.3 reactive-dict@1.1.0 reactive-var@1.0.5 reload@1.1.3 retry@1.0.3 -reywood:publish-composite@1.3.6 +reywood:publish-composite@1.4.2 routepolicy@1.0.5 seriousm:emoji-continued@1.4.0 service-configuration@1.0.4 @@ -103,14 +106,15 @@ softwarerero:accounts-t9n@1.0.9 spacebars@1.0.6 spacebars-compiler@1.0.6 srp@1.0.3 -tap:i18n@1.4.1 +tap:i18n@1.5.1 templating@1.1.1 tmeasday:presence@1.0.6 tracker@1.0.7 ui@1.0.6 underscore@1.0.3 url@1.0.4 -useraccounts:core@1.11.0 -useraccounts:unstyled@1.11.0 +useraccounts:core@1.12.2 +useraccounts:iron-routing@1.12.2 +useraccounts:unstyled@1.12.2 webapp@1.2.0 webapp-hashing@1.0.3 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