diff --git a/README.md b/README.md index 51bfb34..2b01f33 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ You can use Font Awesome icons in your own module/theme with the following code: ``` php if (module_exists('font_awesome')) { // Add Font Awesome CSS classes to your HTML here. - // See http://fontawesome.io/examples/ for examples. + // See https://fontawesome.com/how-to-use/on-the-web/referencing-icons/basic-use for examples. } ``` @@ -38,7 +38,7 @@ Credits ------- - Ported to Backdrop CMS by Andy Martha (https://github.com/biolithic) -- Uses Dave Gandy's Font Awesome project (http://fontawesome.io) +- Uses Dave Gandy's Font Awesome project (https://fontawesome.com) License ------- diff --git a/config/font_awesome.settings.json b/config/font_awesome.settings.json index c14139f..ed35663 100644 --- a/config/font_awesome.settings.json +++ b/config/font_awesome.settings.json @@ -1,6 +1,5 @@ { "_config_name": "font_awesome.settings", - "fontawesome": "v5", - "pseudo": false + "fontawesome": "v5" } diff --git a/font_awesome.admin.inc b/font_awesome.admin.inc index 6bd8cef..7de132d 100644 --- a/font_awesome.admin.inc +++ b/font_awesome.admin.inc @@ -11,25 +11,14 @@ function font_awesome_admin_form($form, &$form_state) { $form['fontawesome'] = array( '#type' => 'radios', '#title' => t('Enable Font Awesome icons'), - '#description' => t('Load the necessary FontAwesome CSS/JS. See the provided links for examples of how to actualy add icons.'), + '#description' => t('Load the necessary FontAwesome CSS. See the provided links for examples of how to actually add icons.'), '#options' => array( '' => t('Disabled'), - 'v4' => t('v4 (fontawesome.io)'), - 'v5' => t('v5 (fontawesome.com)'), + 'v4' => t('v4'), + 'v5' => t('v5'), ), '#default_value' => config_get('font_awesome.settings', 'fontawesome'), ); - $form['pseudo'] = array( - '#type' => 'checkbox', - '#title' => t('Use CSS pseudo-elements'), - '#description' => t("Add icons to pseudo-elements using CSS (for when you can't edit the HTML/markup directly). See fontawesome.com for details."), - '#default_value' => config_get('font_awesome.settings', 'pseudo'), - '#states' => array( - 'visible' => array( - ':input[name="fontawesome"]' => array('value' => 'v5'), - ), - ), - ); $form['#config'] = 'font_awesome.settings'; return system_settings_form($form); diff --git a/font_awesome.install b/font_awesome.install index f584c34..879260c 100644 --- a/font_awesome.install +++ b/font_awesome.install @@ -4,6 +4,13 @@ * Install, update, and uninstall functions for the Font Awesome module. */ +/** + * Remove 'pseudo' config value. + */ +function font_awesome_update_1101(&$sandbox) { + config_clear('font_awesome.settings', 'pseudo'); +} + /** * Update config. */ diff --git a/font_awesome.module b/font_awesome.module index 6833dd0..bd75b2a 100644 --- a/font_awesome.module +++ b/font_awesome.module @@ -20,19 +20,7 @@ function font_awesome_config_info() { * Implements hook_init(). */ function font_awesome_init() { - // Enable CSS pseudo-element icons. - if (config_get('font_awesome.settings', 'pseudo')) { - backdrop_add_js("jQuery(document).ready(function($) { - window.FontAwesomeConfig.searchPseudoElements = true; - /* Added for better performance. See https://fontawesome.com/how-to-use/font-awesome-api#configuration for details. */ - window.FontAwesomeConfig.observeMutations = false; - });", array( - 'type' => 'inline', - 'every_page' => TRUE, - )); - } - - // Add FontAwesome CSS/JS. + // Add FontAwesome CSS. $options = array( 'type' => 'external', 'every_page' => TRUE, @@ -42,7 +30,7 @@ function font_awesome_init() { backdrop_add_css('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css', $options); break; case 'v5': - backdrop_add_js('https://use.fontawesome.com/releases/v5.0.13/js/all.js', $options); + backdrop_add_css('https://use.fontawesome.com/releases/v5.2.0/css/all.css', $options); break; } }