Fixes requirejs#64, make sure has.js amd check gets namespaced.

jrburke · jrburke · commit 682ac7f6ff8b · 2011-12-16T19:47:07.000-08:00
diff --git a/build/jslib/pragma.js b/build/jslib/pragma.js
@@ -38,6 +38,7 @@ define(['parse', 'logger'], function (parse, logger) {
         apiDefRegExp: /var requirejs, require, define;/,
         defineCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd/g,
         defineJQueryRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g,
+        defineHasRegExp: /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g,
         defineTernaryRegExp: /typeof\s+define\s*===\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/,
         amdefineRegExp: /if\s*\(\s*typeof define\s*\!==\s*'function'\s*\)\s*\{\s*[^\{\}]+amdefine[^\{\}]+\}/g,
 
@@ -50,7 +51,6 @@ define(['parse', 'logger'], function (parse, logger) {
                 //Namespace require/define calls
                 fileContents = fileContents.replace(pragma.nsRegExp, '$1' + ns + '.$2(');
 
-
                 //Namespace define ternary use:
                 fileContents = fileContents.replace(pragma.defineTernaryRegExp,
                                                     "typeof " + ns + ".define === 'function' && " + ns + ".define.amd ? " + ns + ".define");
@@ -59,6 +59,10 @@ define(['parse', 'logger'], function (parse, logger) {
                 fileContents = fileContents.replace(pragma.defineJQueryRegExp,
                                                     "typeof " + ns + ".define === 'function' && " + ns + ".define.amd && " + ns + ".define.jQuery");
 
+                //Namespace has.js define use:
+                fileContents = fileContents.replace(pragma.defineHasRegExp,
+                                                    "typeof " + ns + ".define === 'function' && typeof " + ns + ".define.amd === 'object' && " + ns + ".define.amd");
+
                 //Namespace define checks.
                 //Do this one last, since it is a subset of the more specific
                 //checks above.
diff --git a/build/tests/lib/namespace/expected.js b/build/tests/lib/namespace/expected.js
@@ -15,10 +15,13 @@ if (typeof foo.define === 'function' && foo.define.amd && foo.define.jQuery) {
     });
 }
 ;
-foo.define('modules/four',{
-    name: 'four'
-});
+if(false){
 
+}else if(typeof foo.define === 'function' && typeof foo.define.amd === 'object' && foo.define.amd){
+    foo.define('modules/four',{
+        name: 'four'
+    });
+};
 (function (define) {
     foo.define('modules/three',[], function (require) {
         //If have dependencies, get them here
diff --git a/build/tests/lib/namespace/modules/four.js b/build/tests/lib/namespace/modules/four.js
@@ -1,3 +1,7 @@
-define({
-    name: 'four'
-});
+if(false){
+
+}else if(typeof define == "function" && typeof define.amd == "object" && define.amd){
+    define({
+        name: 'four'
+    });
+}
diff --git a/dist/r-edge.js b/dist/r-edge.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 1.0.2+ 20111216 7pm Pacific Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 1.0.2+ 20111216 7:40pm Pacific Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib,
-        version = '1.0.2+ 20111216 7pm Pacific',
+        version = '1.0.2+ 20111216 7:40pm Pacific',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         //Used by jslib/rhino/args.js
@@ -7056,6 +7056,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) {
         apiDefRegExp: /var requirejs, require, define;/,
         defineCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd/g,
         defineJQueryRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g,
+        defineHasRegExp: /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g,
         defineTernaryRegExp: /typeof\s+define\s*===\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/,
         amdefineRegExp: /if\s*\(\s*typeof define\s*\!==\s*'function'\s*\)\s*\{\s*[^\{\}]+amdefine[^\{\}]+\}/g,
 
@@ -7068,7 +7069,6 @@ define('pragma', ['parse', 'logger'], function (parse, logger) {
                 //Namespace require/define calls
                 fileContents = fileContents.replace(pragma.nsRegExp, '$1' + ns + '.$2(');
 
-
                 //Namespace define ternary use:
                 fileContents = fileContents.replace(pragma.defineTernaryRegExp,
                                                     "typeof " + ns + ".define === 'function' && " + ns + ".define.amd ? " + ns + ".define");
@@ -7077,6 +7077,10 @@ define('pragma', ['parse', 'logger'], function (parse, logger) {
                 fileContents = fileContents.replace(pragma.defineJQueryRegExp,
                                                     "typeof " + ns + ".define === 'function' && " + ns + ".define.amd && " + ns + ".define.jQuery");
 
+                //Namespace has.js define use:
+                fileContents = fileContents.replace(pragma.defineHasRegExp,
+                                                    "typeof " + ns + ".define === 'function' && typeof " + ns + ".define.amd === 'object' && " + ns + ".define.amd");
+
                 //Namespace define checks.
                 //Do this one last, since it is a subset of the more specific
                 //checks above.
