summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/js
diff options
context:
space:
mode:
authorxue <>2006-12-04 03:15:22 +0000
committerxue <>2006-12-04 03:15:22 +0000
commit6b5f0bdbfb621ab3e4ec0f23c000b780d030d47f (patch)
tree0ae63ad93e55a34189c3f4ff5d4cb8e959495fce /framework/Web/Javascripts/js
parent562979c4a8fe47952edf7986d4144624e41630f7 (diff)
merge from 3.0 branch till 1559.
Diffstat (limited to 'framework/Web/Javascripts/js')
-rw-r--r--framework/Web/Javascripts/js/compressed/logger.js8
-rw-r--r--framework/Web/Javascripts/js/debug/logger.js14
2 files changed, 12 insertions, 10 deletions
diff --git a/framework/Web/Javascripts/js/compressed/logger.js b/framework/Web/Javascripts/js/compressed/logger.js
index 342b4234..4588c723 100644
--- a/framework/Web/Javascripts/js/compressed/logger.js
+++ b/framework/Web/Javascripts/js/compressed/logger.js
@@ -40,7 +40,7 @@ LogEntry=Class.create()
LogEntry.prototype={initialize:function(message,tag){this.message=message
this.tag=tag}}
LogConsole=Class.create()
-LogConsole.prototype={commandHistory:[],commandIndex:0,hidden:true,initialize:function(){this.outputCount=0
+LogConsole.prototype={commandHistory:[],commandIndex:0,hidden:true,initialize:function(toggleKey){this.outputCount=0
this.tagPattern=Cookie.get('tagPattern')||".*"
this.logElement=document.createElement('div')
document.body.appendChild(this.logElement)
@@ -97,7 +97,9 @@ if(document.all&&!window.opera)
{window.setInterval(this.repositionWindow.bind(this),500)}
else
{this.logElement.style.position="fixed";this.logElement.style.bottom="0px";}
-Logger.onupdate.addListener(this.logUpdate.bind(this))
+var self=this;Event.observe(document,'keydown',function(e)
+{if((e.altKey==true)&&Event.keyCode(e)==toggleKey)
+self.toggle();});Logger.onupdate.addListener(this.logUpdate.bind(this))
Logger.onclear.addListener(this.clear.bind(this))
for(var i=0;i<Logger.logEntries.length;i++){this.logUpdate(Logger.logEntries[i])}
Event.observe(window,'error',function(msg,url,lineNumber){Logger.error("Error in ("+(url||location)+") on line "+lineNumber+"",msg)})
@@ -152,7 +154,7 @@ if(this.commandIndex<this.commandHistory.length-1){this.commandIndex+=1}}
else if(e.keyCode==Event.KEY_DOWN&&this.commandHistory.length>0){if(this.commandIndex>0){this.commandIndex-=1}
this.inputElement.value=this.commandHistory[this.commandIndex]}
else{this.commandIndex=0}}}
-var logConsole;Event.OnLoad(function(){logConsole=new LogConsole()});function inspect(o)
+function inspect(o)
{var objtype=typeof(o);if(objtype=="undefined"){return"undefined";}else if(objtype=="number"||objtype=="boolean"){return o+"";}else if(o===null){return"null";}
try{var ostring=(o+"");}catch(e){return"["+typeof(o)+"]";}
if(typeof(o)=="function")
diff --git a/framework/Web/Javascripts/js/debug/logger.js b/framework/Web/Javascripts/js/debug/logger.js
index 5d465d56..37e5028e 100644
--- a/framework/Web/Javascripts/js/debug/logger.js
+++ b/framework/Web/Javascripts/js/debug/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