diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-08-10 20:42:05 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-08-10 20:42:05 -0300 |
| commit | 5e36ecaaa02678a2a94230f224ea31acfa2593bf (patch) | |
| tree | 09d6c49f835af63914aa2749b187bcfe9312cdf2 | |
| parent | db21c18df808d2d97be3bab60a3f4fc0eb07c054 (diff) | |
| download | askbot-5e36ecaaa02678a2a94230f224ea31acfa2593bf.tar.gz askbot-5e36ecaaa02678a2a94230f224ea31acfa2593bf.tar.bz2 askbot-5e36ecaaa02678a2a94230f224ea31acfa2593bf.zip | |
require click to activate the mozilla persona login
| -rw-r--r-- | askbot/conf/login_providers.py | 2 | ||||
| -rw-r--r-- | askbot/media/jquery-openid/jquery.openid.js | 20 | ||||
| -rw-r--r-- | askbot/templates/authopenid/signin.html | 1 | ||||
| -rw-r--r-- | askbot/templates/authopenid/widget_signin.html | 1 |
4 files changed, 12 insertions, 12 deletions
diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py index f4a5a24d..fad29687 100644 --- a/askbot/conf/login_providers.py +++ b/askbot/conf/login_providers.py @@ -142,7 +142,7 @@ providers = ( 'LaunchPad', ) -DISABLED_BY_DEFAULT = ('LaunchPad',) +DISABLED_BY_DEFAULT = ('LaunchPad', 'Mozilla Persona') NEED_EXTRA_SETUP = ('Twitter', 'Facebook', 'LinkedIn', 'identi.ca',) diff --git a/askbot/media/jquery-openid/jquery.openid.js b/askbot/media/jquery-openid/jquery.openid.js index dac4d297..34d6e91b 100644 --- a/askbot/media/jquery-openid/jquery.openid.js +++ b/askbot/media/jquery-openid/jquery.openid.js @@ -394,18 +394,13 @@ $.fn.authenticator = function() { var setupMozillaPersonaListeners = function() { navigator.id.watch({ - loggedInUser: askbot['data']['userEmail'], + //loggedInUser: askbot['data']['userEmail'], onlogin: function(assertion) { var assertionElement = signin_form.find('input[name=persona_assertion]'); assertionElement.val(assertion); provider_name_input.val('mozilla-persona'); signin_form.submit(); return false; - }, - onlogout: function() { - if (askbot['data']['userIsAuthenticated']) { - window.location.href = askbot['urls']['signOut']; - } } }); }; @@ -429,14 +424,21 @@ $.fn.authenticator = function() { var mozillaPersonaBtn = signin_page.find('input.mozilla-persona'); if (mozillaPersonaBtn.length) { - setupMozillaPersonaListeners(); + var mozillaPersonaInitiated = false; + var personaListener = function() { + if (mozillaPersonaInitiated === false) { + setupMozillaPersonaListeners(); + mozillaPersonaInitiated = true; + } + start_mozilla_persona_login(); + return false; + }; setup_event_handlers( signin_page.find('input.mozilla-persona'), - start_mozilla_persona_login + personaListener ); } - setup_event_handlers( signin_page.find('input.oauth,input.oauth2'), start_simple_login diff --git a/askbot/templates/authopenid/signin.html b/askbot/templates/authopenid/signin.html index c2717023..ddf37fbf 100644 --- a/askbot/templates/authopenid/signin.html +++ b/askbot/templates/authopenid/signin.html @@ -158,7 +158,6 @@ <tr>
<th>{% trans %}provider{% endtrans %}</th>
<th>{% trans %}last used{% endtrans %}</th>
- <th>{% trans %}delete, if you like{% endtrans %}</th>
</tr>
{% for login_method in existing_login_methods %}
<tr class="ab-provider-row">
diff --git a/askbot/templates/authopenid/widget_signin.html b/askbot/templates/authopenid/widget_signin.html index 4cedd014..5970b6c3 100644 --- a/askbot/templates/authopenid/widget_signin.html +++ b/askbot/templates/authopenid/widget_signin.html @@ -151,7 +151,6 @@ <tr>
<th>{% trans %}provider{% endtrans %}</th>
<th>{% trans %}last used{% endtrans %}</th>
- <th>{% trans %}delete, if you like{% endtrans %}</th>
</tr>
{% for login_method in existing_login_methods %}
<tr class="ab-provider-row">
|