summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-12-19 12:48:33 +0200
committerLeif Åstrand <leif@vaadin.com>2011-12-19 12:57:54 +0200
commitdcb22a0e3e621ba6f39fccbf4898148644cecd39 (patch)
treea77bd28f52d77e32df124408315e4d56d031070c /WebContent/VAADIN
parentda29f7426740179f86ae6535fee240f04899da41 (diff)
downloadvaadin-framework-dcb22a0e3e621ba6f39fccbf4898148644cecd39.tar.gz
vaadin-framework-dcb22a0e3e621ba6f39fccbf4898148644cecd39.zip
Logging from bootstrap only if debug is enabled
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/vaadinBootstrap.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 5728903545..19da0cfc5a 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -6,7 +6,7 @@
var log;
- if (typeof console === "undefined") {
+ if (typeof console === "undefined" || !window.location.search.match(/[&?]debug(&|$)/)) {
//If no console.log present, just use a no-op
log = function() {};
} else if (typeof console.log === "function") {
@@ -97,7 +97,6 @@
if (r.readyState == 4) {
if (r.status == 200){
log("Got root config response", r.responseText);
- // TODO Does this work in all supported browsers?
var updatedConfig = JSON.parse(r.responseText);
// Copy new properties to the config object