Merge pull request #5787 from Liunkae/UI-links-tooltips

Add tooltips to external links in the UI
brave · Dec 5, 2016 · 4fd36c8 · 4fd36c8
2 parents 827c856 + 371299c
commit 4fd36c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/renderer/components/widevineInfo.js b/app/renderer/components/widevineInfo.js
@@ -46,13 +46,15 @@ class WidevineInfo extends ImmutableComponent {
         <span style={widevineInfoIconStyle}
           className='fa fa-info-circle'
           onClick={this.onMoreInfo}
+          title={appConfig.widevine.moreInfoUrl}
         />
       </div>
       <div className='subtext'>
         <span data-l10n-id='enableWidevineSubtext2' />
         <span style={widevineInfoIconStyle}
           className='fa fa-info-circle'
           onClick={this.onViewLicense}
+          title={appConfig.widevine.licenseUrl}
         />
       </div>
     </div>

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -1615,7 +1615,7 @@ class SecurityTab extends ImmutableComponent {
                 <span data-l10n-id='enableFlashSubtext' />&nbsp;
                 <span className='linkText' onClick={aboutActions.newFrame.bind(null, {
                   location: appConfig.flash.installUrl
-                }, true)}>{'Adobe'}</span>.
+                }, true)} title={appConfig.flash.installUrl}>{'Adobe'}</span>.
               </div>
               : <div>
                 <span className='fa fa-info-circle' id='flashInfoIcon' />
@@ -1627,7 +1627,7 @@ class SecurityTab extends ImmutableComponent {
             <span data-l10n-id='flashTroubleshooting' />&nbsp;
             <span className='linkText' onClick={aboutActions.newFrame.bind(null, {
               location: 'https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'
-            }, true)}>{'wiki'}</span>.
+            }, true)} title='https://github.com/brave/browser-laptop/wiki/Flash-Support-Deprecation-Proposal#troubleshooting-flash-issues'>{'wiki'}</span>.
           </div>
         </div>
       </SettingsList>

diff --git a/js/components/braveryPanel.js b/js/components/braveryPanel.js
@@ -304,7 +304,7 @@ class BraveryPanel extends ImmutableComponent {
                     <option data-l10n-id='block3rdPartyCookie' value='block3rdPartyCookie' />
                     <option data-l10n-id='allowAllCookies' value='allowAllCookies' />
                   </select>
-                  <SwitchControl onClick={this.onToggleFp} rightl10nId='fingerprintingProtection' checkedOn={fpEnabled} disabled={!shieldsUp} onInfoClick={this.onInfoClick} className='fingerprintingProtectionSwitch' />
+                  <SwitchControl onClick={this.onToggleFp} rightl10nId='fingerprintingProtection' checkedOn={fpEnabled} disabled={!shieldsUp} onInfoClick={this.onInfoClick} infoTitle={config.fingerprintingInfoUrl} className='fingerprintingProtectionSwitch' />
                   <SwitchControl onClick={this.onToggleSafeBrowsing} rightl10nId='safeBrowsing' checkedOn={this.props.braverySettings.safeBrowsing} disabled={!shieldsUp} />
                 </div>
               </div></span>

diff --git a/js/components/switchControl.js b/js/components/switchControl.js
@@ -57,7 +57,7 @@ class SwitchControl extends ImmutableComponent {
           ? <span className='switchControlRightText' data-l10n-id={this.props.rightl10nId} data-l10n-args={this.props.rightl10nArgs}>{this.props.rightText || ''}</span>
           : null}
           {(this.props.rightl10nId || this.props.rightText) && this.props.onInfoClick
-          ? <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>
+          ? <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>
           : null}
         </div>
       }