1
1
/**
2
- * @license r.js 2.1.1+ Tue, 20 Nov 2012 20:29:53 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
2
+ * @license r.js 2.1.1+ Wed, 21 Nov 2012 21:49:04 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
3
3
* Available via the MIT or new BSD license.
4
4
* see: http://github.com/jrburke/requirejs for details
5
5
*/
@@ -21,7 +21,7 @@ var requirejs, require, define;
21
21
22
22
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
23
23
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode,
24
- version = '2.1.1+ Tue, 20 Nov 2012 20:29:53 GMT',
24
+ version = '2.1.1+ Wed, 21 Nov 2012 21:49:04 GMT',
25
25
jsSuffixRegExp = /\.js$/,
26
26
commandOption = '',
27
27
useLibLoaded = {},
@@ -1133,6 +1133,11 @@ var requirejs, require, define;
1133
1133
//it.
1134
1134
getModule(moduleMap);
1135
1135
1136
+ //Transfer any config to this other module.
1137
+ if (hasProp(config.config, id)) {
1138
+ config.config[moduleName] = config.config[id];
1139
+ }
1140
+
1136
1141
try {
1137
1142
req.exec(text);
1138
1143
} catch (e) {
@@ -1254,7 +1259,10 @@ var requirejs, require, define;
1254
1259
};
1255
1260
1256
1261
function callGetModule(args) {
1257
- getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
1262
+ //Skip modules already defined.
1263
+ if (!hasProp(defined, args[0])) {
1264
+ getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
1265
+ }
1258
1266
}
1259
1267
1260
1268
function removeListener(node, func, name, ieName) {
@@ -20569,7 +20577,8 @@ define('rhino/optimize', ['logger', 'env!env/file'], function (logger, file) {
20569
20577
};
20570
20578
}
20571
20579
20572
- var JSSourceFilefromCode, optimize;
20580
+ var JSSourceFilefromCode, optimize,
20581
+ mapRegExp = /"file":"[^"]+"/;
20573
20582
20574
20583
//Bind to Closure compiler, but if it is not available, do not sweat it.
20575
20584
try {
@@ -20605,6 +20614,7 @@ define('rhino/optimize', ['logger', 'env!env/file'], function (logger, file) {
20605
20614
closure: function (fileName, fileContents, outFileName, keepLines, config) {
20606
20615
config = config || {};
20607
20616
var result, mappings, optimized, compressed, baseName, writer,
20617
+ outBaseName, outFileNameMap, outFileNameMapContent,
20608
20618
jscomp = Packages.com.google.javascript.jscomp,
20609
20619
flags = Packages.com.google.common.flags,
20610
20620
//Fake extern
@@ -20649,15 +20659,22 @@ define('rhino/optimize', ['logger', 'env!env/file'], function (logger, file) {
20649
20659
optimized = String(compiler.toSource());
20650
20660
20651
20661
if (config.generateSourceMaps && result.sourceMap && outFileName) {
20652
- baseName = (new java.io.File(outFileName)).getName();
20662
+ outBaseName = (new java.io.File(outFileName)).getName();
20653
20663
20654
20664
file.saveUtf8File(outFileName + ".src", fileContents);
20655
20665
20656
- writer = getFileWriter(outFileName + ".map", "utf-8");
20666
+ outFileNameMap = outFileName + ".map";
20667
+ writer = getFileWriter(outFileNameMap, "utf-8");
20657
20668
result.sourceMap.appendTo(writer, outFileName);
20658
20669
writer.close();
20659
20670
20660
- fileContents = optimized + "\n//@ sourceMappingURL=" + baseName + ".map";
20671
+ //Not sure how better to do this, but right now the .map file
20672
+ //leaks the full OS path in the "file" property. Manually
20673
+ //modify it to not do that.
20674
+ file.saveFile(outFileNameMap,
20675
+ file.readFile(outFileNameMap).replace(mapRegExp, '"file":"' + baseName + '"'));
20676
+
20677
+ fileContents = optimized + "\n//@ sourceMappingURL=" + outBaseName + ".map";
20661
20678
} else {
20662
20679
fileContents = optimized;
20663
20680
}
0 commit comments