In-Portal Issue Tracker

Welcome to the In-Portal Open Source CMS Issue Tracker! This is a central management / tracking tool for all types of tasks / issues / bugs for the In-Portal Project. Before reporting any issues, please make sure to read the Guide into Issue Tracker and How to Properly Test and Report Bugs!

Viewing Issue Advanced Details [ Jump to Notes ] [ Wiki ]

[ View Simple ] [ Issue History ] [ Print ]

Tags

No tags attached.

Reference

https://groups.google.com/d/topic/in-portal-dev/_la1B1b7oeQ/discussion

Change Log Message

Allow to change debugger activation shortcut

Estimate Points

Attached Files

custom_debugger_activation_shortcut.patch [^] (5,594 bytes) 2012-06-14 06:15 [Show Content]

Index: core/kernel/utility/debugger.php
===================================================================
--- core/kernel/utility/debugger.php	(revision 15369)
+++ core/kernel/utility/debugger.php	(working copy)
@@ -407,6 +407,7 @@
 					'DBG_DOMVIEWER'				=>	'/temp/domviewer.html',		// path to DOMViewer on website
 					'DOC_ROOT'					=>	str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
 					'DBG_LOCAL_BASE_PATH'		=>	'w:',						// replace DOC_ROOT in filenames (in errors) using this path
+					'DBG_SHORTCUT'				=>	'F12',						// Defines debugger activation shortcut (any symbols or Ctrl/Alt/Shift are allowed, e.g. Ctrl+Alt+F12)
 				);
 
 				// only for IE, in case if no windows php script editor defined
@@ -999,7 +1000,7 @@
 			{
 				$this->Data[] = Array ('html' => $html, 'debug_type' => 'html');
 			}
-			
+
 			/**
 			 * Returns instance of FirePHP class
 			 *
@@ -1554,6 +1555,7 @@
 					'SQLTime' => isset($this->ProfilerTotals['sql']) ? sprintf('%.5f', $this->ProfilerTotals['sql']) : 0,
 					'ScriptTime' => sprintf('%.5f', $this->ProfilerData['script_runtime']['ends'] - $this->ProfilerData['script_runtime']['begins']),
 					'ScriptMemory' => DebuggerUtil::formatSize($this->getMemoryUsed($debugger_start)),
+					'Shortcut' => DBG_SHORTCUT,
 				);
 
 				ob_start();
@@ -1563,7 +1565,7 @@
 			?>
 					<div style="display: none" x='nothing'><script></script></div><html><body></body></html>
 					<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" media="screen" />
-					<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v3"></script>
+					<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v4"></script>
 
 					<script type="text/javascript">
 						var $Debugger = new Debugger(<?php echo json_encode($debugger_params); ?>);
Index: core/kernel/utility/debugger/debugger.js
===================================================================
--- core/kernel/utility/debugger/debugger.js	(revision 15359)
+++ core/kernel/utility/debugger/debugger.js	(working copy)
@@ -66,6 +66,7 @@
 	this.SQLTime = 0;
 	this.ScriptTime = 0;
 	this.ScriptMemory = 0;
+	this.Shortcut = 'F12';
 
 	for (var $param_name in $params) {
 		this[$param_name] = $params[$param_name];
@@ -243,13 +244,102 @@
 }
 
 Debugger.prototype.KeyDown = function($e) {
-	var $KeyCode = this.GetKeyCode($e);
-	if ($KeyCode == 123 || $KeyCode == 27) {// F12 or ESC
+	var $matched_parts = 0,
+		$KeyCode = this.GetKeyCode($e),
+		$shortcut_parts = this.Shortcut.toLowerCase().split('+');
+
+	$e = ($e) ? $e : event;
+
+	var $modifier_map = {
+		'ctrl': $e.ctrlKey,
+		'shift': $e.shiftKey,
+		'alt': $e.altKey,
+		'meta': $e.metaKey
+	};
+
+	for (var $i = 0; $i < $shortcut_parts.length; $i++) {
+		for (var $modifier in $modifier_map) {
+			if ( $shortcut_parts[$i] == $modifier && $modifier_map[$modifier] ) {
+				$matched_parts++;
+				break;
+			}
+		}
+
+		if ( this.getKeyCodeFromString($shortcut_parts[$i]) == $KeyCode ) {
+			$matched_parts++;
+		}
+	}
+
+	if ( $matched_parts == $shortcut_parts.length || $KeyCode == 27 ) {// F12 or ESC
 		this.Toggle($KeyCode);
 		this.StopEvent($e);
 	}
 }
 
+Debugger.prototype.getKeyCodeFromString = function($string) {
+	var $special_keys = {
+		'esc': 27,
+		'escape': 27,
+		'tab': 9,
+		'space': 32,
+		'return': 13,
+		'enter': 13,
+		'backspace': 8,
+
+		'scrolllock': 145,
+		'scroll_lock': 145,
+		'scroll': 145,
+		'capslock': 20,
+		'caps_lock': 20,
+		'caps': 20,
+		'numlock': 144,
+		'num_lock': 144,
+		'num': 144,
+
+		'pause': 19,
+		'break': 19,
+
+		'insert': 45,
+		'home': 36,
+		'delete': 46,
+		'end': 35,
+
+		'pageup': 33,
+		'page_up': 33,
+		'pu': 33,
+
+		'pagedown': 34,
+		'page_down': 34,
+		'pd': 34,
+
+		'left': 37,
+		'up': 38,
+		'right': 39,
+		'down': 40,
+
+		'f1': 112,
+		'f2': 113,
+		'f3': 114,
+		'f4': 115,
+		'f5': 116,
+		'f6': 117,
+		'f7': 118,
+		'f8': 119,
+		'f9': 120,
+		'f10': 121,
+		'f11': 122,
+		'f12': 123
+	};
+
+	$string = $string.toLowerCase();
+
+	if ( $special_keys[$string] !== undefined ) {
+		return $special_keys[$string];
+	}
+
+	return $string.charCodeAt(0);
+}
+
 Debugger.prototype.OpenDOMViewer = function() {
 	var $value = document.getElementById('dbg_domviewer').value;
 	DOMViewerObj = ($value.indexOf('"') != -1) ? document.getElementById( $value.substring(1,$value.length-1) ) : eval($value);
@@ -259,9 +349,14 @@
 
 Debugger.prototype.GetKeyCode = function($e) {
 	$e = ($e) ? $e : event;
-	var target = ($e.target) ? $e.target : $e.scrElement;
 	var charCode = ($e.charCode) ? $e.charCode : (($e.which) ? $e.which : $e.keyCode);
-	return charCode;
+
+	if ( charCode == 27 ) {
+		// don't lowercase ESC
+		return charCode;
+	}
+
+	return String.fromCharCode(charCode).toLowerCase().charCodeAt(0);
 }
 
 Debugger.prototype.StopEvent = function($e) {
Index: tools/debug_sample.php
===================================================================
--- tools/debug_sample.php	(revision 15408)
+++ tools/debug_sample.php	(working copy)
@@ -56,4 +56,5 @@
 //		'DBG_SQL_MODE'			=>	'TRADITIONAL',	// Extra control over sql syntax & data from MySQL server side
 //		'DBG_RESET_ROOT'		=>	1,				// Shows "root" user password reset link on Admin Console login screen
 //		'DBG_CACHE_URLS'		=>	0,				// Cache urls, that are build by rewrite listeners
+//		'DBG_SHORTCUT'			=>	'F12'			// Defines debugger activation shortcut (any symbols or Ctrl/Alt/Shift are allowed, e.g. Ctrl+Alt+F12)
 	);
\ No newline at end of file

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0004723) alex (manager) 2012-06-14 06:16	Will test all together later.

(0004724) alex (manager) 2012-06-14 06:17	Fix committed to 5.2.x branch. Commit Message: Fixes 0001323: Changing Shortcut for In-Portal Debugger

(0004863) alex (manager) 2012-07-25 05:29	Since 5.2.0 version was released.

Related Changesets
In-Portal CMS: 5.2.x r15409 Timestamp: 2012-06-14 06:17:23 Author: alex [ Details ] [ Diff ]	Fixes 0001323: Changing Shortcut for In-Portal Debugger
	mod - /in-portal/branches/5.2.x/core/kernel/utility/debugger/debugger.js	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/kernel/utility/debugger.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/tools/debug_sample.php	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2012-07-25 05:29	alex	Note Added: 0004863
2012-07-25 05:29	alex	Status	resolved => closed
2012-06-14 06:17	alex	Note Added: 0004724
2012-06-14 06:17	alex	Status	reviewed and tested => resolved
2012-06-14 06:17	alex	Fixed in Version	=> 5.2.0
2012-06-14 06:17	alex	Resolution	open => fixed
2012-06-14 06:17	alex	Assigned To	!COMMUNITY => alex
2012-06-14 06:17	alex	Changeset attached	5.2.x r15409
2012-06-14 06:16	alex	Note Added: 0004723
2012-06-14 06:16	alex	Status	needs testing => reviewed and tested
2012-06-14 06:16	alex	Assigned To	=> !COMMUNITY
2012-06-14 06:16	alex	Developer	=> alex
2012-06-14 06:16	alex	Status	active => needs testing
2012-06-14 06:15	alex	File Added: custom_debugger_activation_shortcut.patch
2012-06-14 05:16	alex	New Issue
2012-06-14 05:16	alex	Reference	=> https://groups.google.com/d/topic/in-portal-dev/_la1B1b7oeQ/discussion
2012-06-14 05:16	alex	Change Log Message	=> Allow to change debugger activation shortcut
2012-06-14 05:16	alex	Estimate Points	=> 1

Web Development by Intechnic

In-Portal Open Source CMS