From 56a595dc57ae1e3c466bb779d44f23d9ae716737 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 25 Aug 2015 16:19:40 +0000
Subject: [PATCH] Expose debug level, and tie etemplate2 profiling to debug
 level 4 - Log

---
 etemplate/js/etemplate2.js     | 54 ++++++++++++++++++++--------------
 phpgwapi/js/jsapi/egw_debug.js |  3 ++
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 51c347bc72..52d22e8156 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -355,19 +355,26 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
 	// Register a handler for AJAX responses
 	egw(currentapp, window).registerJSONPlugin(etemplate2_handle_assign, this, 'assign');
 
-	if(console.groupCollapsed)
+	if(egw.debug_level() >= 3)
 	{
-		egw.window.console.groupCollapsed("Loading %s into ", _name, '#'+this.DOMContainer.id);
+		if(console.groupCollapsed)
+		{
+			egw.window.console.groupCollapsed("Loading %s into ", _name, '#'+this.DOMContainer.id);
+		}
 	}
-	if(console.time)
+	// Timing & profiling on debug level 'log' (4)
+	if(egw.debug_level() >= 4)
 	{
-		console.time(_name);
+		if(console.time)
+		{
+			console.time(_name);
+		}
+		if(console.profile)
+		{
+			console.profile(_name);
+		}
+		var start_time = (new Date).getTime();
 	}
-	if(console.profile)
-	{
-		console.profile(_name);
-	}
-	var start_time = (new Date).getTime();
 
 	// require necessary translations from server, if not already loaded
 	if (!$j.isArray(_data.langRequire)) _data.langRequire = [];
@@ -434,7 +441,7 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
 
 		var _load = function() {
 			egw.debug("log", "Loading template...");
-			if(console.timeStamp)
+			if(egw.debug_level() >= 4 && console.timeStamp)
 			{
 				console.timeStamp("Begin rendering template");
 			}
@@ -462,7 +469,7 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
 			// Insert the document fragment to the DOM Container
 			this.DOMContainer.appendChild(frag);
 
-			if(console.groupEnd)
+			if(egw.debug_level >= 3 && console.groupEnd)
 			{
 				egw.window.console.groupEnd();
 			}
@@ -524,19 +531,22 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
 				$j(this.DOMContainer).trigger('load', this);
 
 				// Profiling
-				if(console.timeEnd)
+				if(egw.debug_level() >= 4)
 				{
-					console.timeEnd(_name);
+					if(console.timeEnd)
+					{
+						console.timeEnd(_name);
+					}
+					if(console.profileEnd)
+					{
+						console.profileEnd(_name);
+					}
+					var end_time = (new Date).getTime();
+					var gen_time_div = $j('#divGenTime_'+appname);
+					if (!gen_time_div.length) gen_time_div = $j('.pageGenTime');
+					gen_time_div.find('.et2RenderTime').remove();
+					gen_time_div.append('<span class="et2RenderTime">'+egw.lang('eT2 rendering took %1s', (end_time-start_time)/1000)+'</span>');
 				}
-				if(console.profileEnd)
-				{
-					console.profileEnd(_name);
-				}
-				var end_time = (new Date).getTime();
-				var gen_time_div = $j('#divGenTime_'+appname);
-				if (!gen_time_div.length) gen_time_div = $j('.pageGenTime');
-				gen_time_div.find('.et2RenderTime').remove();
-				gen_time_div.append('<span class="et2RenderTime">'+egw.lang('eT2 rendering took %1s', (end_time-start_time)/1000)+'</span>');
 			},this));
 		};
 
diff --git a/phpgwapi/js/jsapi/egw_debug.js b/phpgwapi/js/jsapi/egw_debug.js
index 76b7db68a2..155f500d5f 100644
--- a/phpgwapi/js/jsapi/egw_debug.js
+++ b/phpgwapi/js/jsapi/egw_debug.js
@@ -315,6 +315,9 @@ egw.extend('debug', egw.MODULE_GLOBAL, function(_app, _wnd) {
 	 * console function.
 	 */
 	return {
+		debug_level: function() {
+			return DEBUGLEVEL;
+		},
 		debug: function(_level) {
 			if (typeof _wnd.console != "undefined")
 			{