CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8907 from hodigabi/issue/8906

Browse Source 
[Issue8906] Fix broken html in the Area part of the Walkthrough
This commit is contained in:
Martin Raifer
2022-01-28 11:33:41 +01:00
committed by GitHub
parent 765e8e3448 29697aa728
commit ee30fb2371
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/context.js
View File

@@ -8,7 +8,6 @@ import { t } from '../core/localizer';
import { fileFetcher } from './file_fetcher';
import { localizer } from './localizer';
import { prefs } from './preferences';
import { coreHistory } from './history';
import { coreValidator } from './validator';
import { coreUploader } from './uploader';
@@ -32,9 +31,6 @@ export function coreContext() {
// iD will alter the hash so cache the parameters intended to setup the session
context.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
context.isFirstSession = !prefs('sawSplash') && !prefs('sawPrivacyVersion');
/* Changeset */
// An osmChangeset object. Not loaded until needed.
context.changeset = null;

8
modules/ui/intro/area.js
View File

@@ -328,8 +328,8 @@ export function uiIntroArea(context, reveal) {
timeout(function() {
reveal('.more-fields .combobox-input',
helpHtml('intro.areas.add_field', {
name: nameField.label(),
description: descriptionField.label()
name: { html: nameField.label() },
description: { html: descriptionField.label() }
}),
{ duration: 300 }
);
@@ -395,7 +395,7 @@ export function uiIntroArea(context, reveal) {
}, 300);
reveal('div.combobox',
helpHtml('intro.areas.choose_field', { field: descriptionField.label() }),
helpHtml('intro.areas.choose_field', { field: { html: descriptionField.label() } }),
{ duration: 300 }
);
@@ -456,7 +456,7 @@ export function uiIntroArea(context, reveal) {
context.container().select('.inspector-wrap .panewrap').style('right', '0%');
reveal('.entity-editor-pane',
helpHtml('intro.areas.retry_add_field', { field: descriptionField.label() }), {
helpHtml('intro.areas.retry_add_field', { field: { html: descriptionField.label() } }), {
buttonText: t.html('intro.ok'),
buttonCallback: function() { continueTo(clickAddField); }
});