onRendered callbacks for atInput and weak deps for routing packages

meteor-useraccounts · Aug 16, 2015 · b1892c8 · b1892c8
1 parent 2ed7977
commit b1892c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/at_input.js b/lib/at_input.js
@@ -1,4 +1,6 @@
-Template.atInput.rendered = AccountsTemplates.atInputRendered;
+_.each(AccountsTemplates.atInputRendered, function(callback){
+  Template.atInput.onRendered(callback);
+});
 
 // Simply 'inherites' helpers from AccountsTemplates
 Template.atInput.helpers(AccountsTemplates.atInputHelpers);
@@ -19,4 +21,4 @@ Template.atSelectInput.helpers(AccountsTemplates.atInputHelpers);
 Template.atRadioInput.helpers(AccountsTemplates.atInputHelpers);
 
 // Simply 'inherites' helpers from AccountsTemplates
-Template.atHiddenInput.helpers(AccountsTemplates.atInputHelpers);
+Template.atHiddenInput.helpers(AccountsTemplates.atInputHelpers);
diff --git a/package.js b/package.js
@@ -10,11 +10,16 @@ Package.on_use(function(api, where) {
 
   api.use([
     'templating',
+    'underscore',
   ], 'client');
 
   api.use([
     'useraccounts:core',
   ], ['client', 'server']);
+
+  // Requires all routing packages loads before this asking for weak dependencies.
+  api.use('useraccounts:[email protected]', ['client', 'server'], {weak: true});
+  api.use('useraccounts:[email protected]', ['client', 'server'], {weak: true});
 
   api.imply([
     'useraccounts:[email protected]',