snapshot update

jrburke · jrburke · commit f006d3f73c2e · 2012-06-18T10:33:32.000-07:00
diff --git a/dist/r.js b/dist/r.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.0.2+ Mon, 18 Jun 2012 04:35:08 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.0.2+ Mon, 18 Jun 2012 17:33:16 GMT Copyright (c) 2010-2012, 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, existsForNode,
-        version = '2.0.2+ Mon, 18 Jun 2012 04:35:08 GMT',
+        version = '2.0.2+ Mon, 18 Jun 2012 17:33:16 GMT',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -556,7 +556,7 @@ var requirejs, require, define;
                 } else {
                     //A regular module.
                     normalizedName = normalize(name, parentName, applyMap);
-                    url = context.nameToUrl(normalizedName, null, parentModuleMap);
+                    url = context.nameToUrl(normalizedName);
                 }
             }
 
@@ -1680,8 +1680,7 @@ var requirejs, require, define;
                 }
 
                 return context.nameToUrl(normalize(moduleNamePlusExt, relModuleMap && relModuleMap.id, true),
-                                         ext,
-                                         relModuleMap);
+                                         ext);
             },
 
             /**
diff --git a/require.js b/require.js
@@ -450,7 +450,7 @@ var requirejs, require, define;
                 } else {
                     //A regular module.
                     normalizedName = normalize(name, parentName, applyMap);
-                    url = context.nameToUrl(normalizedName, null, parentModuleMap);
+                    url = context.nameToUrl(normalizedName);
                 }
             }
 
@@ -1574,8 +1574,7 @@ var requirejs, require, define;
                 }
 
                 return context.nameToUrl(normalize(moduleNamePlusExt, relModuleMap && relModuleMap.id, true),
-                                         ext,
-                                         relModuleMap);
+                                         ext);
             },
 
             /**

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ var requirejs, require, define;`
`450`	`450`	`} else {`
`451`	`451`	`//A regular module.`
`452`	`452`	`normalizedName = normalize(name, parentName, applyMap);`
`453`		`- url = context.nameToUrl(normalizedName, null, parentModuleMap);`
	`453`	`+ url = context.nameToUrl(normalizedName);`
`454`	`454`	`}`
`455`	`455`	`}`
`456`	`456`
`@@ -1574,8 +1574,7 @@ var requirejs, require, define;`
`1574`	`1574`	`}`
`1575`	`1575`
`1576`	`1576`	`return context.nameToUrl(normalize(moduleNamePlusExt, relModuleMap && relModuleMap.id, true),`
`1577`		`- ext,`
`1578`		`- relModuleMap);`
	`1577`	`+ ext);`
`1579`	`1578`	`},`
`1580`	`1579`
`1581`	`1580`	`/**`