From 4cc5be00c002fb77115a558e1669115fe1f2dfc9 Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Tue, 9 Oct 2012 20:23:39 -0700 Subject: [PATCH] Add null support for options in Meteor.loginWithTwitter and Meteor.loginWithWeibo --- packages/accounts-twitter/twitter_client.js | 9 ++++++++- packages/accounts-weibo/weibo_client.js | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/accounts-twitter/twitter_client.js b/packages/accounts-twitter/twitter_client.js index 5640aea99b..3eb979d57d 100644 --- a/packages/accounts-twitter/twitter_client.js +++ b/packages/accounts-twitter/twitter_client.js @@ -1,5 +1,12 @@ (function () { - Meteor.loginWithTwitter = function (callback) { + // XXX support options.requestPermissions as we do for Facebook, Google, Github + Meteor.loginWithTwitter = function (options, callback) { + // support both (options, callback) and (callback). + if (!callback && typeof options === 'function') { + callback = options; + options = {}; + } + var config = Accounts.loginServiceConfiguration.findOne({service: 'twitter'}); if (!config) { callback && callback(new Accounts.ConfigError("Service not configured")); diff --git a/packages/accounts-weibo/weibo_client.js b/packages/accounts-weibo/weibo_client.js index 26cdad6efb..7f2aea042f 100644 --- a/packages/accounts-weibo/weibo_client.js +++ b/packages/accounts-weibo/weibo_client.js @@ -1,5 +1,12 @@ (function () { - Meteor.loginWithWeibo = function (callback) { + // XXX support options.requestPermissions as we do for Facebook, Google, Github + Meteor.loginWithWeibo = function (options, callback) { + // support both (options, callback) and (callback). + if (!callback && typeof options === 'function') { + callback = options; + options = {}; + } + var config = Accounts.loginServiceConfiguration.findOne({service: 'weibo'}); if (!config) { callback && callback(new Accounts.ConfigError("Service not configured"));