CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-18 22:48:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2965 from kepta/2960

Browse Source 
Support HTTPS URIs where available
This commit is contained in:
Bryan Housel
2016-02-04 11:59:20 -05:00
parent 2e83ed2a9e 4f328f6bfb
commit 5bf9028a8c
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/renderer/background_source.js
+1 -1
View File
@@ -117,7 +117,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
};
bing.logo = 'bing_maps.png';
bing.terms_url = 'http://opengeodata.org/microsoft-imagery-details';
bing.terms_url = 'https://blog.openstreetmap.org/2010/11/30/microsoft-imagery-details';
return bing;
};
js/id/renderer/mapillary_layer.js
+1 -1
View File
@@ -16,7 +16,7 @@ iD.MapillaryLayer = function (context) {
.attr('src', 'https://d1cuyjsrcm0gby.cloudfront.net/' + image.key + '/thumb-320.jpg');
div.selectAll('a')
.attr('href', 'http://mapillary.com/map/im/' + image.key);
.attr('href', 'https://www.mapillary.com/map/im/' + image.key);
}
function hide() {
js/id/ui.js
+1 -1
View File
@@ -123,7 +123,7 @@ iD.ui = function(context) {
.append('a')
.attr('target', '_blank')
.attr('tabindex', -1)
.attr('href', 'http://github.com/openstreetmap/iD')
.attr('href', 'https://github.com/openstreetmap/iD')
.text(iD.version);
var issueLinks = aboutList.append('li');
js/id/ui/feature_list.js
+1 -1
View File
@@ -245,7 +245,7 @@ iD.ui.FeatureList = function(context) {
function geocode() {
var searchVal = encodeURIComponent(search.property('value'));
d3.json('http://nominatim.openstreetmap.org/search/' + searchVal + '?limit=10&format=json', function(err, resp) {
d3.json('https://nominatim.openstreetmap.org/search/' + searchVal + '?limit=10&format=json', function(err, resp) {
geocodeResults = resp || [];
drawList();
});
js/id/ui/preset/wikipedia.js
+2 -2
View File
@@ -128,13 +128,13 @@ iD.ui.preset.wikipedia = function(field, context) {
anchor = anchor.replace(/ /g, '_');
}
}
link.attr('href', 'http://' + m[1] + '.wikipedia.org/wiki/' +
link.attr('href', 'https://' + m[1] + '.wikipedia.org/wiki/' +
m[2].replace(/ /g, '_') + (anchor ? ('#' + anchor) : ''));
// unrecognized value format
} else {
title.value(value);
link.attr('href', 'http://en.wikipedia.org/wiki/Special:Search?search=' + value);
link.attr('href', 'https://en.wikipedia.org/wiki/Special:Search?search=' + value);
}
};
js/id/ui/tag_reference.js
+1 -1
View File
@@ -69,7 +69,7 @@ iD.ui.TagReference = function(tag, context) {
body
.append('a')
.attr('target', '_blank')
.attr('href', 'http://wiki.openstreetmap.org/wiki/' + docs.title)
.attr('href', 'https://wiki.openstreetmap.org/wiki/' + docs.title)
.call(iD.svg.Icon('#icon-out-link', 'inline'))
.append('span')
.text(t('inspector.reference'));
test/spec/ui/preset/wikipedia.js
+1 -1
View File
@@ -12,7 +12,7 @@ describe('iD.ui.preset.wikipedia', function() {
wikipedia.tags({wikipedia: 'en:Title'});
expect(selection.selectAll('.wiki-lang').value()).to.equal('English');
expect(selection.selectAll('.wiki-title').value()).to.equal('Title');
expect(selection.selectAll('.wiki-link').attr('href')).to.equal('http://en.wikipedia.org/wiki/Title');
expect(selection.selectAll('.wiki-link').attr('href')).to.equal('https://en.wikipedia.org/wiki/Title');
});
it('sets a new value', function() {