Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r875 -r903
--- trunk/kernel/include/debugger.php (.../debugger.php) (revision 875)
+++ trunk/kernel/include/debugger.php (.../debugger.php) (revision 903)
@@ -175,7 +175,7 @@
function formatSQL($sql)
{
$sql = preg_replace('/(\n|\t| )+/is',' ',$sql);
- $sql = preg_replace('/(SELECT|UPDATE|REPLACE|INSERT|DELETE|VALUES|FROM|LEFT JOIN|WHERE|HAVING|GROUP BY|ORDER BY) /is', "\n\t$1 ",$sql);
+ $sql = preg_replace('/(CREATE TABLE|DROP TABLE|SELECT|UPDATE|REPLACE|INSERT|DELETE|VALUES|FROM|LEFT JOIN|WHERE|HAVING|GROUP BY|ORDER BY) /is', "\n\t$1 ",$sql);
return $this->highlightString($sql);
}
@@ -368,7 +368,7 @@
$this->appendSession();
// ensure, that 1st line of debug output always is this one:
- $this->appendHTML('Hide Debugger');
+ $this->appendHTML('Hide Debugger');
$this->moveToBegin(1);
$i = 0; $lineCount = count($this->Data);
@@ -382,8 +382,7 @@
}
.debug_layer_table {
- border: 1px solid red;
- border-width: 0 0 1 1;
+ border-collapse: collapse;
width: 480px;
}
@@ -395,8 +394,8 @@
}
.debug_cell {
- border: 1px solid red;
- border-width: 1 1 0 0;
+ border: 1px solid #FF0000;
+ padding: 2px;
word-wrap: break-word;
}
@@ -459,22 +458,25 @@
{
if(!$e) $e = window.event;
var $KeyCode = getEventKeyCode($e);
- //alert(showProps($e));
- if($KeyCode == 123 || $KeyCode == 27) // F12 or ESC
+ if($KeyCode==123||$KeyCode==27) // F12 or ESC
{
- toggleDebugLayer();
+ toggleDebugLayer($KeyCode);
$e.cancelBubble = true;
if($e.stopPropagation) $e.stopPropagation();
}
}
- function toggleDebugLayer()
+ function toggleDebugLayer($KeyCode)
{
+ var $isVisible=false;
var $DebugLayer = document.getElementById('debug_layer');
if( typeof($DebugLayer) != 'undefined' )
{
+ $isVisible = ($DebugLayer.style.display == 'none')?false:true;
+ if(!$isVisible&&$KeyCode==27) return false;
+
resizeDebugLayer(null);
- $DebugLayer.style.display = ($DebugLayer.style.display == 'none') ? 'block' : 'none';
+ $DebugLayer.style.display = $isVisible?'none':'block';
}
}
@@ -548,6 +550,12 @@
function editFile($fileName,$lineNo)
{
+ if(!document.all)
+ {
+ alert('Only works in IE');
+ return;
+ }
+
var $editorPath = '';
if($editorPath)
{