diff --git a/extlink.install b/extlink.install index 71bbf7a..eb7662b 100644 --- a/extlink.install +++ b/extlink.install @@ -15,3 +15,10 @@ function extlink_uninstall() { db_query("DELETE FROM {variable} WHERE name LIKE 'extlink_%'"); cache_clear_all('variables', 'cache'); } + +/** + * Delete "extlink_target_value" variable (now uses "extlink_target" directly). + */ +function extlink_update_7101(&$sandbox) { + variable_del('extlink_target_value'); +} diff --git a/extlink.js b/extlink.js index 6be6e1b..72653b0 100644 --- a/extlink.js +++ b/extlink.js @@ -92,7 +92,7 @@ Drupal.extlink.attach = function (context, settings) { if (settings.extlink.extTarget) { // Apply the target attribute to all links. - $(external_links).attr('target', settings.extlink.extTargetValue); + $(external_links).attr('target', settings.extlink.extTarget); } Drupal.extlink = Drupal.extlink || {}; @@ -120,9 +120,10 @@ Drupal.extlink.attach = function (context, settings) { */ Drupal.extlink.applyClassAndSpan = function (links, class_name) { var $links_to_process; - if(Drupal.settings.extlink.extImgClass){ + if (Drupal.settings.extlink.extImgClass){ $links_to_process = $(links); - }else { + } + else { if (parseFloat($().jquery) < 1.2) { $links_to_process = $(links).not('[img]'); } diff --git a/extlink.module b/extlink.module index e1aabe9..9bf7d60 100644 --- a/extlink.module +++ b/extlink.module @@ -23,7 +23,6 @@ function extlink_page_build() { drupal_add_js($path .'/extlink.js', array('every_page' => TRUE)); drupal_add_js(array('extlink' => array( 'extTarget' => variable_get('extlink_target', 0), - 'extTargetValue'=> variable_get('extlink_target_value', ''), 'extClass' => variable_get('extlink_class', 'ext'), 'extImgClass' => variable_get('extlink_img_class', 0), 'extSubdomains' => variable_get('extlink_subdomains', 1), @@ -77,20 +76,6 @@ function extlink_admin_settings() { '#return_value' => '_blank', '#default_value' => variable_get('extlink_target', 0), ); - - $form['extlink_target_value'] = array( - '#type' => 'textarea', - '#title' => t('Target value for new window.'), - '#rows' => 1, - '#default_value' => variable_get('extlink_target_value', '_blank'), - '#wysiwyg' => FALSE, - '#states' => array( - // Only show this field when user opts to open in new window. - 'visible' => array( - ':input[name="extlink_target"]' => array('checked' => TRUE), - ), - ), - ); $form['extlink_alert'] = array( '#type' => 'checkbox',