From c4d31153e76caf0dbccdfe108574afc4b030c926 Mon Sep 17 00:00:00 2001
From: Peter Wu
Date: Sat, 2 Aug 2014 16:26:17 +0200
Subject: Merge (a)sync code, reformat CGP.js

Best viewed with `git diff -w`.

Since CGP-sync.js and CGP-async.js are almost equal except for one
function call, merge them into a single function. While at it, reformat
CGP.js to expose a single namespace (`CGP`) which exports the symbol
`drawAll`.

Remove `alert()` and add a `console.error()` call instead. This is less
intrustive to users (who will notice a broken graph anyway) and be more
helpful for developers (who can examine the call trace in the Developer
Console.

Add `"use strict"` and use the standard four spaces as indent. Process
the script through `js-beautify` which re-indented the code and added
some spaces between operators. Replace double by single quotes for
consistency. Rename `catch(e)` to `catch(ex)` to supress a jshint
warning about IE8.
---
 inc/html.inc.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'inc/html.inc.php')

diff --git a/inc/html.inc.php b/inc/html.inc.php
index c8cfbaf..117d61d 100644
--- a/inc/html.inc.php
+++ b/inc/html.inc.php
@@ -99,21 +99,18 @@ function html_end() {
 EOT;
 
 	if ($CONFIG['graph_type'] == 'canvas') {
-		echo <<<EOT
-<script type="text/javascript" src="{$html_weburl}js/CGP.js"></script>
-
-EOT;
 		if ($CONFIG['rrd_fetch_method'] == 'async') {
-		echo <<<EOT
-<script type="text/javascript" src="{$html_weburl}js/CGP-async.js"></script>
-
-EOT;
+			$js_async = 'true';
 		} else {
+			$js_async = 'false';
+		}
 		echo <<<EOT
-<script type="text/javascript" src="{$html_weburl}js/CGP-sync.js"></script>
+<script src="{$html_weburl}js/CGP.js"></script>
+<script>
+CGP.drawAll($js_async);
+</script>
 
 EOT;
-		}
 	}
 
 echo <<<EOT
-- 
cgit v1.1