merge from 3.0 branch till 1559.

1 files changed, 7 insertions, 7 deletions

diff --git a/framework/Web/Javascripts/extra/logger.js b/framework/Web/Javascripts/extra/logger.js
index 5771f2f4..b21df1ae 100644
--- a/framework/Web/Javascripts/extra/logger.js
+++ b/framework/Web/Javascripts/extra/logger.js
@@ -200,7 +200,7 @@ LogConsole.prototype = {
   // Methods

   // -------

 

-  initialize : function() {

+  initialize : function(toggleKey) {

     this.outputCount = 0

     this.tagPattern = Cookie.get('tagPattern') || ".*"

 

@@ -283,6 +283,12 @@ LogConsole.prototype = {
 		this.logElement.style.position="fixed";

 		this.logElement.style.bottom="0px";

 	}

+	var self=this;

+	Event.observe(document, 'keydown', function(e)

+	{ 

+		if((e.altKey==true) && Event.keyCode(e) == toggleKey ) //Alt+J | Ctrl+J

+			self.toggle();

+	});

 

     // Listen to the logger....

     Logger.onupdate.addListener(this.logUpdate.bind(this))

@@ -452,12 +458,6 @@ LogConsole.prototype = {
 	}

 }

 

-// Load the Console when the window loads

-var logConsole;

-Event.OnLoad(function() { logConsole = new LogConsole()});

-

-

-

 

 // -------------------------

 // Helper Functions And Junk