Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 4fd36c8

Browse files
authored
Merge pull request #5787 from Liunkae/UI-links-tooltips
Add tooltips to external links in the UI
2 parents 827c856 + 371299c commit 4fd36c8

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

app/renderer/components/widevineInfo.js

+2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ class WidevineInfo extends ImmutableComponent {
4646
<span style={widevineInfoIconStyle}
4747
className='fa fa-info-circle'
4848
onClick={this.onMoreInfo}
49+
title={appConfig.widevine.moreInfoUrl}
4950
/>
5051
</div>
5152
<div className='subtext'>
5253
<span data-l10n-id='enableWidevineSubtext2' />
5354
<span style={widevineInfoIconStyle}
5455
className='fa fa-info-circle'
5556
onClick={this.onViewLicense}
57+
title={appConfig.widevine.licenseUrl}
5658
/>
5759
</div>
5860
</div>

js/about/preferences.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,7 @@ class SecurityTab extends ImmutableComponent {
16151615
<span data-l10n-id='enableFlashSubtext' />&nbsp;
16161616
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
16171617
location: appConfig.flash.installUrl
1618-
}, true)}>{'Adobe'}</span>.
1618+
}, true)} title={appConfig.flash.installUrl}>{'Adobe'}</span>.
16191619
</div>
16201620
: <div>
16211621
<span className='fa fa-info-circle' id='flashInfoIcon' />
@@ -1627,7 +1627,7 @@ class SecurityTab extends ImmutableComponent {
16271627
<span data-l10n-id='flashTroubleshooting' />&nbsp;
16281628
<span className='linkText' onClick={aboutActions.newFrame.bind(null, {
16291629
location: 'https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'
1630-
}, true)}>{'wiki'}</span>.
1630+
}, true)} title='https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'>{'wiki'}</span>.
16311631
</div>
16321632
</div>
16331633
</SettingsList>

js/components/braveryPanel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ class BraveryPanel extends ImmutableComponent {
304304
<option data-l10n-id='block3rdPartyCookie' value='block3rdPartyCookie' />
305305
<option data-l10n-id='allowAllCookies' value='allowAllCookies' />
306306
</select>
307-
<SwitchControl onClick={this.onToggleFp} rightl10nId='fingerprintingProtection' checkedOn={fpEnabled} disabled={!shieldsUp} onInfoClick={this.onInfoClick} className='fingerprintingProtectionSwitch' />
307+
<SwitchControl onClick={this.onToggleFp} rightl10nId='fingerprintingProtection' checkedOn={fpEnabled} disabled={!shieldsUp} onInfoClick={this.onInfoClick} infoTitle={config.fingerprintingInfoUrl} className='fingerprintingProtectionSwitch' />
308308
<SwitchControl onClick={this.onToggleSafeBrowsing} rightl10nId='safeBrowsing' checkedOn={this.props.braverySettings.safeBrowsing} disabled={!shieldsUp} />
309309
</div>
310310
</div></span>

js/components/switchControl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class SwitchControl extends ImmutableComponent {
5757
? <span className='switchControlRightText' data-l10n-id={this.props.rightl10nId} data-l10n-args={this.props.rightl10nArgs}>{this.props.rightText || ''}</span>
5858
: null}
5959
{(this.props.rightl10nId || this.props.rightText) && this.props.onInfoClick
60-
? <div className='switchControlRightText'><span data-l10n-id={this.props.rightl10nId} data-l10n-args={this.props.rightl10nArgs}>{this.props.rightText}</span><span className='fa fa-question-circle info clickable' onClick={this.props.onInfoClick} /></div>
60+
? <div className='switchControlRightText'><span data-l10n-id={this.props.rightl10nId} data-l10n-args={this.props.rightl10nArgs}>{this.props.rightText}</span><span className='fa fa-question-circle info clickable' onClick={this.props.onInfoClick} title={this.props.infoTitle} /></div>
6161
: null}
6262
</div>
6363
}

0 commit comments

Comments
 (0)