diff --git a/alameda-prim.js b/alameda-prim.js index 9f80134..85fee11 100644 --- a/alameda-prim.js +++ b/alameda-prim.js @@ -1,5 +1,5 @@ /** - * @license alameda 1.0.0 Copyright jQuery Foundation and other contributors. + * @license alameda 1.1.0 Copyright jQuery Foundation and other contributors. * Released under MIT license, http://github.com/requirejs/alameda/LICENSE */ // Going sloppy because loader plugin execs may depend on non-strict execution. @@ -244,7 +244,7 @@ var requirejs, require, define; queue = [], currDirRegExp = /^\.\//, urlRegExp = /^\/|\:|\?|\.js$/, - commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, + commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, slice = Array.prototype.slice; @@ -254,7 +254,7 @@ var requirejs, require, define; } // Could match something like ')//comment', do not lose the prefix to comment. - function commentReplace(match, multi, multiText, singlePrefix) { + function commentReplace(match, singlePrefix) { return singlePrefix || ''; } diff --git a/bower.json b/bower.json index 0e523f9..574c1c4 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "alameda-prim", - "version": "1.0.0", + "version": "1.1.0", "ignore": [ ".gitignore", ".npmignore", diff --git a/package.json b/package.json index 1dbeb2d..adb2050 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "alameda-prim", "description": "The alameda AMD loader that includes a private promise shim", - "version": "1.0.0", + "version": "1.1.0", "homepage": "http://github.com/requirejs/alameda-prim", "author": "James Burke (http://github.com/jrburke)", "license": "MIT", diff --git a/parts/alameda.js b/parts/alameda.js index a406dce..3f2f384 100644 --- a/parts/alameda.js +++ b/parts/alameda.js @@ -1,5 +1,5 @@ /** - * @license alameda 1.0.0 Copyright jQuery Foundation and other contributors. + * @license alameda 1.1.0 Copyright jQuery Foundation and other contributors. * Released under MIT license, http://github.com/requirejs/alameda/LICENSE */ // Going sloppy because loader plugin execs may depend on non-strict execution. @@ -19,7 +19,7 @@ var requirejs, require, define; queue = [], currDirRegExp = /^\.\//, urlRegExp = /^\/|\:|\?|\.js$/, - commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, + commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, slice = Array.prototype.slice; @@ -29,7 +29,7 @@ var requirejs, require, define; } // Could match something like ')//comment', do not lose the prefix to comment. - function commentReplace(match, multi, multiText, singlePrefix) { + function commentReplace(match, singlePrefix) { return singlePrefix || ''; }