From d0a8dc1f03b4a2e3fd80ee7bc66b08e25be2f385 Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Mon, 26 Nov 2012 15:44:27 -0500 Subject: [PATCH] Support logging out. Fixes #114 --- js/iD/Connection.js | 5 +++++ js/iD/OAuth.js | 2 +- js/iD/id.js | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/js/iD/Connection.js b/js/iD/Connection.js index 765fdfd6d..9170f39f3 100644 --- a/js/iD/Connection.js +++ b/js/iD/Connection.js @@ -144,6 +144,11 @@ iD.Connection = function() { return connection; }; + connection.logout = function() { + oauth.logout(); + return connection; + }; + connection.bboxFromAPI = bboxFromAPI; connection.wayFromAPI = wayFromAPI; connection.loadFromURL = loadFromURL; diff --git a/js/iD/OAuth.js b/js/iD/OAuth.js index e5f90df75..572b2b624 100644 --- a/js/iD/OAuth.js +++ b/js/iD/OAuth.js @@ -35,7 +35,7 @@ iD.OAuth = function() { oauth.logout = function() { token('oauth_token', ''); token('oauth_token_secret', ''); - return ouath; + return oauth; }; oauth.xhr = function(options, callback) { diff --git a/js/iD/id.js b/js/iD/id.js index 27407cfad..11ea94ca2 100644 --- a/js/iD/id.js +++ b/js/iD/id.js @@ -134,11 +134,19 @@ var iD = function(container) { if (connection.authenticated()) { connection.userDetails(function(user_details) { connection.user(user_details); - d3.select('.user .hello').text('hi, ') - .append('a') - .attr('href', connection.url() + '/user/' + user_details.display_name) - .attr('target', '_blank') - .text(user_details.display_name); + d3.select('.user').html(''); + d3.select('.user') + .append('span') + .text('signed in as ') + .append('a') + .attr('href', connection.url() + '/user/' + user_details.display_name) + .attr('target', '_blank') + .text(user_details.display_name); + d3.select('.user') + .append('a') + .attr('class', 'logout') + .text('logout') + .on('click', connection.logout); }); } };