Download Jquery Flot from CDNJS

torkelsson · Oct 12, 2015 · a08ecf4 · a08ecf4
1 parent 1194d26
commit a08ecf4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/conf_default.php.in b/conf_default.php.in
@@ -453,6 +453,8 @@ $conf['protovis_js_path'] = "https://cdnjs.cloudflare.com/ajax/libs/protovis/3.3
 $conf['jstree_js_path'] = "https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js";
 $conf['jstree_css_path'] = "https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css";
 
+$conf['jquery_flot_base_path'] = "https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot";
+
 # Enable Cubism integration http://square.github.io/cubism/
 $conf['cubism_enabled'] = true;
 $conf['cubism_default_height'] = 30;

diff --git a/graph_all_periods.php b/graph_all_periods.php
@@ -109,9 +109,8 @@ function openDecompose($url) {
 // Add JQuery and flot loading only if this is not embedded in the 
 // Aggregate Graphs Tab
 if (!isset($_GET['embed'])) { ?>
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/excanvas.min.js"></script><![endif]-->
-<script language="javascript" type="text/javascript" src="js/jquery.flot.min.js"></script>
-<script language="javascript" type="text/javascript" src="js/jquery.flot.time.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.time.min.js"></script>
 <?php
 } // end of if (!isset($_GET['embed'])
 ?>

diff --git a/inspect_graph.php b/inspect_graph.php
@@ -1,10 +1,13 @@
-<script language="javascript" type="text/javascript" src="js/jquery.flot.min.js"></script>
-<script language="javascript" type="text/javascript" src="js/jquery.flot.crosshair.min.js"></script>
-<script language="javascript" type="text/javascript" src="js/jquery.flot.stack.min.js"></script>
+<?php
+include_once "./eval_conf.php";
+?>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.crosshair.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.stack.min.js"></script>
 <script language="javascript" type="text/javascript" src="js/jquery.multiselect.js"></script>
 <script language="javascript" type="text/javascript" src="js/jquery.multiselect.filter.js"></script>
-<script language="javascript" type="text/javascript" src="js/jquery.flot.selection.min.js"></script>
-<script language="javascript" type="text/javascript" src="js/jquery.flot.time.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.selection.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php print $conf['jquery_flot_base_path']; ?>.time.min.js"></script>
 <script language="javascript" type="text/javascript" src="js/jquery.flot.events.js"></script>
 <script type="text/javascript" src="js/create-flot-graphs.js"></script>