holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some docu and checks for console.log being defined

Browse Source
This commit is contained in:
Andreas Stöckel 2010-07-20 10:54:56 +00:00
parent 7ad65804d5
commit 70319aefd6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/js/egw_json.js
View File

@ -416,7 +416,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
//Increment the includedJSFiles count //Increment the includedJSFiles count
this.loadedJSFiles[res.data] = false; this.loadedJSFiles[res.data] = false;
if (typeof console != 'undefined') if (typeof console != 'undefined' && typeof console.log != 'undefined')
console.log("Requested JS file '%s' from server", [res.data]); console.log("Requested JS file '%s' from server", [res.data]);
var self = this; var self = this;
@ -424,7 +424,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
//FF, Opera, Chrome //FF, Opera, Chrome
scriptnode.onload = function(e) { scriptnode.onload = function(e) {
var file = e.target._originalSrc; var file = e.target._originalSrc;
if (typeof console != 'undefined') if (typeof console != 'undefined' && typeof console.log != 'undefined')
console.log("Retrieved JS file '%s' from server", [file]); console.log("Retrieved JS file '%s' from server", [file]);
self.loadedJSFiles[file] = true; self.loadedJSFiles[file] = true;
@ -436,7 +436,7 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
var node = window.event.srcElement; var node = window.event.srcElement;
if (node.readyState == 'complete') { if (node.readyState == 'complete') {
var file = node._originalSrc; var file = node._originalSrc;
if (typeof console != 'undefined') if (typeof console != 'undefined' && typeof console.log != 'undefined')
console.log("Retrieved JS file '%s' from server", [file]); console.log("Retrieved JS file '%s' from server", [file]);
self.loadedJSFiles[file] = true; self.loadedJSFiles[file] = true;
@ -477,6 +477,10 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
} }
} }
/**
* The "onLoadFinish" handler gets called after all JS-files have been loaded
* successfully
*/
egw_json_request.prototype.checkLoadFinish = function() egw_json_request.prototype.checkLoadFinish = function()
{ {
var complete = true; var complete = true;
@ -485,7 +489,6 @@ egw_json_request.prototype.checkLoadFinish = function()
if (complete && this.onLoadFinish && this.handleResponseDone) if (complete && this.onLoadFinish && this.handleResponseDone)
{ {
console.log("Call onLoadFinish");
this.onLoadFinish.call(this.sender); this.onLoadFinish.call(this.sender);
} }
} }