From a0edf68cbfd877e719eff1698701ad000c8ca4d0 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 17 Apr 2013 17:25:04 -0700 Subject: [PATCH] URL, not Url --- js/id/connection.js | 4 ++-- js/id/ui/account.js | 2 +- js/id/ui/commit.js | 2 +- js/id/ui/contributors.js | 2 +- js/id/ui/success.js | 4 ++-- test/spec/connection.js | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/js/id/connection.js b/js/id/connection.js index 195f2725e..e83ecbf4b 100644 --- a/js/id/connection.js +++ b/js/id/connection.js @@ -19,7 +19,7 @@ iD.Connection = function(context, options) { relationStr = 'relation', off; - connection.changesetUrl = function(changesetId) { + connection.changesetURL = function(changesetId) { return url + '/browse/changeset/' + changesetId; }; @@ -27,7 +27,7 @@ iD.Connection = function(context, options) { return url + '/browse/' + entity.type + '/' + entity.osmId(); }; - connection.userUrl = function(username) { + connection.userURL = function(username) { return url + "/user/" + username; }; diff --git a/js/id/ui/account.js b/js/id/ui/account.js index ff94cb6f0..97de778fb 100644 --- a/js/id/ui/account.js +++ b/js/id/ui/account.js @@ -17,7 +17,7 @@ iD.ui.Account = function(context) { // Link var userLink = selection.append('a') - .attr('href', connection.userUrl(details.display_name)) + .attr('href', connection.userURL(details.display_name)) .attr('target', '_blank'); // Add thumbnail or dont diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js index ea6a3b7c2..8645f2a00 100644 --- a/js/id/ui/commit.js +++ b/js/id/ui/commit.js @@ -64,7 +64,7 @@ iD.ui.Commit = function(context) { userLink.append('a') .attr('class','user-info') .text(user.display_name) - .attr('href', connection.userUrl(user.display_name)) + .attr('href', connection.userURL(user.display_name)) .attr('tabindex', -1) .attr('target', '_blank'); diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js index a2b994053..80125eed1 100644 --- a/js/id/ui/contributors.js +++ b/js/id/ui/contributors.js @@ -22,7 +22,7 @@ iD.ui.Contributors = function(context) { .enter() .append('a') .attr('class', 'user-link') - .attr('href', function(d) { return context.connection().userUrl(d); }) + .attr('href', function(d) { return context.connection().userURL(d); }) .attr('target', '_blank') .attr('tabindex', -1) .text(String); diff --git a/js/id/ui/success.js b/js/id/ui/success.js index 67f1685a7..223f9dfa7 100644 --- a/js/id/ui/success.js +++ b/js/id/ui/success.js @@ -14,7 +14,7 @@ iD.ui.Success = function(connection) { } var message = (m || 'Edited OSM!') + - connection.changesetUrl(changeset.id); + connection.changesetURL(changeset.id); var links = body.append('div').attr('class','modal-actions cf'); @@ -22,7 +22,7 @@ iD.ui.Success = function(connection) { .attr('class','col6 osm') .attr('target', '_blank') .attr('href', function() { - return connection.changesetUrl(changeset.id); + return connection.changesetURL(changeset.id); }) .text(t('view_on_osm')); diff --git a/test/spec/connection.js b/test/spec/connection.js index 12a099f4c..2b7346fa3 100644 --- a/test/spec/connection.js +++ b/test/spec/connection.js @@ -18,13 +18,13 @@ describe('iD.Connection', function () { describe('#changesetUrl', function() { it('provides a changeset url', function() { - expect(c.changesetUrl(2)).to.eql('http://www.openstreetmap.org/browse/changeset/2'); + expect(c.changesetURL(2)).to.eql('http://www.openstreetmap.org/browse/changeset/2'); }); }); - describe('#userUrl', function() { + describe('#userURL', function() { it('provides a user url', function() { - expect(c.userUrl('bob')).to.eql('http://www.openstreetmap.org/user/bob'); + expect(c.userURL('bob')).to.eql('http://www.openstreetmap.org/user/bob'); }); }); @@ -39,7 +39,7 @@ describe('iD.Connection', function () { c.switch({ url: "http://example.com" }); - expect(c.changesetUrl(1)).to.equal("http://example.com/browse/changeset/1") + expect(c.changesetURL(1)).to.equal("http://example.com/browse/changeset/1") }); it("emits an auth event", function(done) {