--- jq_maphilight.module	2009-06-22 11:03:45.000000000 -0700
+++ jq_maphilight1.module	2009-06-27 16:15:18.000000000 -0700
@@ -1,5 +1,5 @@
 <?php
-// $Id: jq_maphilight.module,v 1.1.2.3 2009/06/22 18:03:45 worldfallz Exp $
+// $Id: jq_maphilight.module,v 1.1 2008/03/25 19:29:39 worldfallz Exp $
 
 /**
  * @file
@@ -11,7 +11,7 @@
  */
 function jq_maphilight_init() {
   $available = _jq_maphilight_available();
-  if ($available !== FALSE) {
+  if (($available !== FALSE)  && (arg(0) != 'admin') && (arg(0) != 'user') && (arg(1) != 'add') && (arg(2) != 'edit')) {
 
     $script = "\$(document).ready(function() { \$.fn.maphilight.defaults = { "
       ."fill: ". variable_get('jq_maphilight_fill', 'true') .","
@@ -22,14 +22,9 @@ function jq_maphilight_init() {
       ."strokeOpacity: ". (variable_get('jq_maphilight_strokeopacity', '10') / 10) .","
       ."strokeWidth: ". variable_get('jq_maphilight_strokewidth', '2') .","
       ."fade: ". variable_get('jq_maphilight_fade', 'true') .","
-      ."alwaysOn: false}; ";
-      
-    if (variable_get('jq_maphilight_allmaps_enabled', 0) == 0) {
-      $script .= "\$('.jq_maphilight').maphilight();});";
-    } else {
-      $script .= "\$('img[usemap]').maphilight();});";
-    }
-    
+      ."alwaysOn: ". variable_get('jq_maphilight_alwayson', 'false') ."}; "
+      ."\$('.jq_maphilight').maphilight();});";
+
     jquery_plugin_add('metadata');
     jquery_plugin_add('maphilight');
     drupal_add_js($script, 'inline');     
@@ -45,7 +40,7 @@ function jq_maphilight_menu() {
   $items = array();
   $items['admin/settings/jq_maphilight'] = array(
     'title' => 'JQuery Map Hilight',
-    'description' => 'Javascript image map highlighting using the jQuery Map Hilight plugin.',
+    'description' => 'Javascript image map highlighting using the jquery Map Hilight plugin.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('jq_maphilight_admin_settings'),
     'access callback' => 'user_access',
@@ -67,25 +62,10 @@ function jq_maphilight_admin_settings() 
     '#description' => (_jq_maphilight_available() !== false) ? t('The Map Hilight jQuery plugin is available at: /') . _jq_maphilight_available() : '<em><span style="color: #A50000;">'. t('The Map Hilight jQuery plugin is unavailable or not located in the jquery_plugin module directory.') .'</span></em>'
   );
 
-  $form['jq_maphilight_allmaps'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('jQuery Map Hilight All Maps'),
-    '#weight' => -9,
-  );
-  
-  $form['jq_maphilight_allmaps']['jq_maphilight_allmaps_enabled'] = array(
-    '#type' => 'radios',
-    '#title' => t('Enable highlighting for all image maps'),
-    '#default_value' => variable_get(jq_maphilight_allmaps_enabled, 1),
-    '#options' => array(t('No'), t('Yes')),
-    '#disabled' => !is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.maphilight.min.js'),
-    '#description' => 'If no, be sure to add <strong><em>class="jq_maphilight"</em></strong> to the &lt;img&gt; tag of all image maps you want highlighted.'
-  );
-  
   $form['jq_maphilight_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('jQuery Map Hilight Plugin Settings'),
-    '#description' => 'You can override the default settings on individual image maps by adding an additional class to the &lt;img&gt; tag. See the README.txt file for more information.'
+    '#description' => 'Be sure to add <strong><em>class="jq_maphilight"</em></strong> to the IMG tag of all image maps you want hilighted.'
   );
 
   $form['jq_maphilight_settings']['jq_maphilight_fill'] = array(
@@ -152,6 +132,14 @@ function jq_maphilight_admin_settings() 
     '#description' => 'Specify whether or not the hilighting uses a fade transition.'
   );
 
+  $form['jq_maphilight_settings']['jq_maphilight_alwayson'] = array(
+    '#type' => 'select',
+    '#title' => t('Always On'),
+    '#options' => array('true' => t('TRUE'), 'false' => t('FALSE')),
+    '#default_value' => (variable_get('jq_maphilight_alwayson', 'false')),
+    '#description' => 'Specify whether or not the hilighting should always be on.'
+  );
+
   return system_settings_form($form);
 }
 
--- jq_maphilight.install	2009-06-19 14:38:16.000000000 -0700
+++ jq_maphilight1.install	2009-06-27 16:15:18.000000000 -0700
@@ -1,5 +1,5 @@
 <?php
-// $Id: jq_maphilight.install,v 1.1.2.1 2009/06/19 21:38:16 worldfallz Exp $
+// $Id: jq_maphilight.install,v 1.1 2008/03/25 19:29:39 worldfallz Exp $
 
 /**
  * Implementation of hook_uninstall().
@@ -13,6 +13,6 @@ function jq_maphilight_uninstall() {
   variable_del('jq_maphilight_strokeopacity');
   variable_del('jq_maphilight_strokewidth');
   variable_del('jq_maphilight_fade');
-  variable_del('jq_maphilight_allmaps_enabled');
+  variable_del('jq_maphilight_alwayson');
   drupal_set_message(t('jQuery Map Hilight module uninstalled.'));
 }
\ No newline at end of file