[Pkg-javascript-commits] [dojo] 12/87: backport [27284]; fixes #14394; !strict

[David Prévot]

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

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

commit f991a3445e12c2e6ad8848d39adb00b761e73b27
Author: Rawld Gill <rgill at altoviso.com>
Date:   Tue Dec 6 08:13:21 2011 +0000

    backport [27284]; fixes #14394; !strict
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.7/dojo@27297 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 _base/loader.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_base/loader.js b/_base/loader.js
index c23283a..ddb1a8c 100644
--- a/_base/loader.js
+++ b/_base/loader.js
@@ -525,6 +525,8 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
 			// if the module is a legacy module, this is the same as executing
 			// but if the module is an AMD module, this means defining, not executing
 			injectModule(module);
+			// the inject may have changed the mode
+			currentMode = getLegacyMode();
 
 			// in sync mode to dojo.require is to execute
 			if(module.executed!==executed && module.injected===arrived){

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