Skip to content

Commit

Permalink
r.js update to latest master.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrburke committed May 14, 2011
1 parent be8102c commit b212b7e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions tools/r.js
Expand Up @@ -2110,8 +2110,8 @@ var require, define;

//Support a default file name to execute. Useful for hosted envs
//like Joyent where it defaults to a server.js as the only executed
//script.
if (!fileName || !jsSuffixRegExp.test(fileName)) {
//script. But only do it if this is not an optimization run.
if (commandOption !== 'o' && (!fileName || !jsSuffixRegExp.test(fileName))) {
fileName = 'main.js';
}

Expand Down Expand Up @@ -7687,7 +7687,11 @@ function (args, build) {

//END OPTIMIZER

exec(readFile(fileName), fileName);
//If fileName does not a command line arg to
//the build, then open it as a build profile.
if (fileName.indexOf('=') === -1) {
exec(readFile(fileName), fileName);
}
} else if (commandOption === 'v') {
console.log('r.js: ' + version + ', RequireJS: ' + require.version);
} else {
Expand Down

0 comments on commit b212b7e

Please sign in to comment.