fix js

Author: makara

flot.module

@@ -74,12 +74,12 @@ function theme_flot_graph($variables) {
 
     $json_data = function_exists('json_encode') ? json_encode($data) : drupal_json_encode($data);
     $json_options = function_exists('json_encode') ? json_encode($options) : drupal_json_encode($options);
-    $data = "if (Drupal.jsEnabled) {
+    $data = "(function ($) {
       $(document).ready(function() {
         Drupal.flot.{$id} = $.plot($('#{$element['id']}'), {$json_data}, {$json_options});
         {$extra}
       });
-    }";
+    })(jQuery);";
     drupal_add_js($data, array('type' => 'inline', 'scope' => JS_DEFAULT));
   }
   return '<div ' . drupal_attributes($element) . '> </div>';
@@ -102,7 +102,7 @@ function flot_add_js() {
     $excanvas = file_exists("{$path}/excanvas.min.js") ? "{$path}/excanvas.min.js" : "{$path}/excanvas.pack.js";
     drupal_add_html_head('<!--[if IE]><script language="javascript" type="text/javascript" src="' . base_path() . $excanvas . '"></script><![endif]-->', $key = NULL /* TODO Set this variable. */);
     drupal_add_js($path . '/jquery.flot.js');
-    drupal_add_js('if (Drupal.jsEnabled) { Drupal.flot = {}; }', array('type' => 'inline', 'scope' => JS_DEFAULT));
+    drupal_add_js('(function ($) { Drupal.flot = Drupal.flot || {}; })(jQuery);', array('type' => 'inline', 'scope' => JS_DEFAULT));
 
     $added = true;
   }