Merge branch 'develop' into lang-attributes

# Conflicts:
#	modules/ui/commit_warnings.js
#	modules/ui/field.js
#	modules/ui/fields/wikidata.js
#	modules/ui/fields/wikipedia.js
#	modules/ui/full_screen.js
#	modules/ui/panels/history.js
#	modules/ui/sections/entity_issues.js
#	modules/ui/sections/map_features.js
#	modules/ui/sections/raw_member_editor.js
#	modules/ui/sections/validation_rules.js
#	modules/ui/tag_reference.js
This commit is contained in:
Quincy Morgan
2020-09-22 10:55:07 -04:00
78 changed files with 744 additions and 436 deletions
+2 -2
View File
@@ -177,7 +177,8 @@ export function uiNoteEditor(context) {
// fast submit if user presses cmd+enter
function keydown() {
if (!(d3_event.keyCode === 13 && d3_event.metaKey)) return;
if (!(d3_event.keyCode === 13 && // ↩ Return
d3_event.metaKey)) return;
var osm = services.osm;
if (!osm) return;
@@ -304,7 +305,6 @@ export function uiNoteEditor(context) {
.attr('class', 'user-info')
.html(user.display_name)
.attr('href', osm.userURL(user.display_name))
.attr('tabindex', -1)
.attr('target', '_blank');
prose