Index: branches/5.2.x/core/kernel/utility/debugger/debugger.js =================================================================== diff -u -N -r14858 -r15130 --- branches/5.2.x/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 14858) +++ branches/5.2.x/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 15130) @@ -58,11 +58,19 @@ } // Debugger -function Debugger($row_separator, $errors_count, $fatal_error, $sql_count) { - this.RowSeparator = $row_separator; - this.IsFatalError = $fatal_error; - this.ErrorsCount = parseInt($errors_count); - this.SQLCount = parseInt($sql_count); +function Debugger($params) { + this.RowSeparator = ''; + this.IsFatalError = false; + this.ErrorsCount = 0; + this.SQLCount = 0; + this.SQLTime = 0; + this.ScriptTime = 0; + this.ScriptMemory = 0; + + for (var $param_name in $params) { + this[$param_name] = $params[$param_name]; + } + this.IsQueried = false; this.IsVisible = false; this.DebuggerDIV = document.getElementById('debug_layer'); @@ -181,9 +189,13 @@ $toolbar_content += 'Turn Off'; if (this.SQLCount > 0) { - $toolbar_content += '' + this.SQLCount + ' sqls'; + $toolbar_content += '' + this.SQLCount + ' sqls (' + this.SQLTime + ' s)'; } + if (this.ScriptTime > 0) { + $toolbar_content += '' + this.ScriptTime + ' s (' + this.ScriptMemory + ')'; + } + $span.innerHTML = '' + $toolbar_content + '
'; this.DebuggerToolbar = $span;