[Pkg-javascript-commits] [dojo] 46/58: fixes #18100, prevent dojo-console-guarantee in webworkers environment

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.10.5
in repository dojo.

commit 6014291cab12b0480a2d8ba6005b76e2c8c336d8
Author: Dylan Schiemann <dylan at dojotoolkit.org>
Date:   Sun Dec 27 07:01:33 2015 -0700

    fixes #18100, prevent dojo-console-guarantee in webworkers environment
    
    (cherry picked from commit e9a9f51cca92e42b90ecf2e7850f1392b995f499)
---
 _base/kernel.js | 12 ++++++++----
 dojo.js         |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/_base/kernel.js b/_base/kernel.js
index 8570f68..2fb25c7 100644
--- a/_base/kernel.js
+++ b/_base/kernel.js
@@ -146,10 +146,14 @@ define(["../has", "./config", "require", "module"], function(has, config, requir
 		};
 	}
 
-	has.add("dojo-guarantee-console",
-		// ensure that console.log, console.warn, etc. are defined
-		1
-	);
+	if(!has("host-webworker")){
+		// console is immutable in FF30+, https://bugs.dojotoolkit.org/ticket/18100
+		has.add("dojo-guarantee-console",
+			// ensure that console.log, console.warn, etc. are defined
+			1
+		);
+	}
+
 	if(has("dojo-guarantee-console")){
 		typeof console != "undefined" || (console = {});
 		//	Be careful to leave 'log' always at the end
diff --git a/dojo.js b/dojo.js
index 587b7a8..c1bc5b7 100644
--- a/dojo.js
+++ b/dojo.js
@@ -176,7 +176,8 @@
 			"dojo-dom-ready-api": 0,
 			"dojo-sniff": 0,
 			"dojo-inject-api": 1,
-			"host-webworker": 1
+			"host-webworker": 1,
+			"dojo-guarantee-console": 0 // console is immutable in FF30+, see https://bugs.dojotoolkit.org/ticket/18100
 		});
 
 		defaultConfig.loaderPatch = {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git