chrome/browser/resources/settings/about_page/about_page.js - Issue 2221563002: MD Settings: About page, allow error messages to contain HTML.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/settings/about_page/about_page.js

Issue 2221563002: MD Settings: About page, allow error messages to contain HTML. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Done. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/settings/about_page/about_page.html ('K') | « chrome/browser/resources/settings/about_page/about_page.html ('k') | chrome/browser/resources/settings/about_page/compiled_resources2.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/about_page/about_page.js

diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js

index 07d8eaa857006e28409964ad66182ee06d85ae13..946ae37bdcc9a57ce456a667c6d177103ceb45a2 100644

--- a/chrome/browser/resources/settings/about_page/about_page.js

+++ b/chrome/browser/resources/settings/about_page/about_page.js

@@ -176,7 +176,10 @@ Polymer({

</if>

return this.i18n('aboutUpgradeUpdating');

default:

- return this.currentUpdateStatusEvent_.message || '';

+ return this.currentUpdateStatusEvent_.message ?

+ parseHtmlSubset(

+ this.currentUpdateStatusEvent_.message).firstChild.outerHTML :

Dan Beam 2016/08/05 23:45:28 nit: var message = this.currentUpdateStatusEvent_

Dan Beam 2016/08/05 23:47:50 wait, doesn't this only work if it starts with 1 (

Dan Beam 2016/08/05 23:49:30 I think parseHtmlSubset('<b>' + text + '</b>').fir

dpapad 2016/08/06 00:00:14 Good catch. Done.

+ '';

}