Merge pull request #4 from erundook/patch-1

meteor 0.6.5 compatibility

Author: oae

login_buttons.js

@@ -108,25 +108,29 @@
   };
 
   Accounts._loginButtons.getLoginServices = function () {
-    var ret = [];
-    // make sure to put password last, since this is how it is styled
-    // in the ui as well.
-    _.each(
-      ['facebook', 'github', 'google', 'twitter', 'weibo', 'password'],
-      function (service) {
-        if (Accounts[service])
-          ret.push({name: service});
-      });
+    // First look for OAuth services.
+    var services = Package['accounts-oauth'] ? Accounts.oauth.serviceNames() : [];
+
+    // Be equally kind to all login services. This also preserves
+    // backwards-compatibility. (But maybe order should be
+    // configurable?)
+    services.sort();
 
-    return ret;
+    // Add password, if it's there; it must come last.
+    if (this.hasPasswordService())
+      services.push('password');
+
+    return _.map(services, function(name) {
+      return {name: name};
+    });
   };
 
   Accounts._loginButtons.hasPasswordService = function () {
-    return Accounts.password;
+    return !!Package['accounts-password'];
   };
 
   Accounts._loginButtons.dropdown = function () {
-    return Accounts._loginButtons.hasPasswordService() || Accounts._loginButtons.getLoginServices().length > 1;
+    return this.hasPasswordService() || getLoginServices().length > 1;
   };
 
   // XXX improve these. should this be in accounts-password instead?

package.js

@@ -3,7 +3,7 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use(['accounts-password','stylus','accounts-urls', 'accounts-base', 'underscore', 'templating', 'bootstrap-3'], 'client');
+  api.use(['handlebars', 'accounts-password','stylus', 'accounts-base', 'underscore', 'templating', 'bootstrap-3'], 'client');
 
   api.add_files([
     'accounts_ui.js',

smart.json

@@ -3,6 +3,6 @@
   "description": "Meteor's accounts templates styled for bootstrap-3",
   "homepage": "https://github.com/mangasocial/meteor-accounts-ui-bootstrap-3",
   "author": "Manga Social Team (http://mangasocial.com)",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "git": "https://github.com/mangasocial/meteor-accounts-ui-bootstrap-3.git"
 }