Index: livecoverage.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/livecoverage/livecoverage.module,v
retrieving revision 1.2
diff -u -p -r1.2 livecoverage.module
--- livecoverage.module	2 Mar 2009 01:28:25 -0000	1.2
+++ livecoverage.module	2 Mar 2009 19:19:52 -0000
@@ -78,14 +78,6 @@ function livecoverage_help($path) {
 }
 
 /**
- * Implementation of hook_init()
- */
-function livecoverage_init() {
-  drupal_add_js(drupal_get_path('module', 'livecoverage') . '/livecoverage.js');
-  drupal_add_css(drupal_get_path('module', 'livecoverage') . '/livecoverage.css');
-}
-
-/**
  * Implementation of hook_perm()
  */
 function livecoverage_perm() {
@@ -234,19 +226,15 @@ function livecoverage_view($node, $tease
       '#value' => $sort_link,
     );
 
-    // Add file path to the Javascript
-    $js = 'var updatefile = "/' . file_directory_path() . '/livecoverage/' . $node->nid . $sort . '.php"';
-
     // Add refresh rate to the Javascript
     $livecoverage_refresh_rate = variable_get('livecoverage_refresh_rate', '180');
 
-    // Locate a subdirectory if necessary
-    $livecoverage_subdirectory = variable_get('livecoverage_subdirectory', '');
+    $settings['livecoverage']['updatefile'] = base_path() . file_directory_path() . '/livecoverage/' . $node->nid . $sort . '.php';
+    $settings['livecoverage']['refresh_rate'] = $livecoverage_refresh_rate . '000';
 
-    $js = 'var updatefile = "/' . $livecoverage_subdirectory . file_directory_path() . '/livecoverage/' . $node->nid . $sort . '.php";';
-    $js .= 'var refresh_rate = ' . $livecoverage_refresh_rate . '000;';
-
-    drupal_add_js($js, 'inline');
+    drupal_add_css(drupal_get_path('module', 'livecoverage') . '/livecoverage.css');
+    drupal_add_js(drupal_get_path('module', 'livecoverage') . '/livecoverage.js');
+    drupal_add_js($settings, 'setting');
 
     // Administrators form
     global $user;