ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js - Issue 2528803002: MD Settings: Internet: Add/fix remaining policy items

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: ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

Issue 2528803002: MD Settings: Internet: Add/fix remaining policy items (Closed)

Patch Set: . Created 4 years, 1 month 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

« ui/webui/resources/cr_elements/policy/cr_policy_network_behavior.js ('K') | « ui/webui/resources/cr_elements/policy/cr_policy_network_behavior.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

diff --git a/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js b/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

index d3ca5f4dcaaf0a2b67f9585815db13e9cb744cda..bc3cabe6129bda722bf4e0b6ea53874d61672bbc 100644

--- a/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

+++ b/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

@@ -77,9 +77,10 @@ Polymer({

* @private

getTooltip_: function(type, property, recommended) {

- if (type == CrPolicyIndicatorType.NONE || typeof property != 'object')

Dan Beam 2016/11/29 05:25:34 wait, how could this possibly not be an object acc

stevenjb 2016/11/30 22:58:19 Oh, it can't, I should have realized that. This pr

+ if (type == CrPolicyIndicatorType.NONE)

return '';

- if (type == CrPolicyIndicatorType.RECOMMENDED) {

+ if (type == CrPolicyIndicatorType.RECOMMENDED &&

+ typeof property == 'object') {

var value = property.Active;

if (value == undefined && property.Effective)

value = property[property.Effective];