1
1
/**
2
- * @license r.js 2.1.1+ Mon, 19 Nov 2012 07:26:43 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
2
+ * @license r.js 2.1.1+ Tue, 20 Nov 2012 01:24:24 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+ Mon, 19 Nov 2012 07:26:43 GMT',
24
+ version = '2.1.1+ Tue, 20 Nov 2012 01:24:24 GMT',
25
25
jsSuffixRegExp = /\.js$/,
26
26
commandOption = '',
27
27
useLibLoaded = {},
@@ -20674,7 +20674,8 @@ function (lang, logger, envOptimize, file, parse,
20674
20674
var optimize,
20675
20675
cssImportRegExp = /\@import\s+(url\()?\s*([^);]+)\s*(\))?([\w, ]*)(;)?/g,
20676
20676
cssCommentImportRegExp = /\/\*[^\*]*@import[^\*]*\*\//g,
20677
- cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g;
20677
+ cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g,
20678
+ endSemicolonRegExp = /;\s*$/;
20678
20679
20679
20680
/**
20680
20681
* If an URL from a CSS url value contains start/end quotes, remove them.
@@ -21020,6 +21021,9 @@ function (lang, logger, envOptimize, file, parse,
21020
21021
if (config.max_line_length) {
21021
21022
fileContents = processor.split_lines(fileContents, config.max_line_length);
21022
21023
}
21024
+
21025
+ //Add trailing semicolon to match uglifyjs command line version
21026
+ fileContents += ';';
21023
21027
} catch (e) {
21024
21028
errMessage = e.toString();
21025
21029
errMatch = /\nError(\r)?\n/.exec(errMessage);
0 commit comments