aboutsummaryrefslogtreecommitdiffstats
path: root/build/tasks
diff options
context:
space:
mode:
authorTimmy Willison <4timmywil@gmail.com>2016-08-15 11:41:11 -0400
committerTimmy Willison <4timmywil@gmail.com>2016-08-15 11:54:55 -0400
commit52e24471c89b80e6208b4987bb76994e64c1e489 (patch)
tree5914b1a5bec65c59f94f9780f45b35029d03641a /build/tasks
parent560c0c6f995a4f7584dac5be8fe5eea114a95f69 (diff)
downloadjquery-52e24471c89b80e6208b4987bb76994e64c1e489.tar.gz
jquery-52e24471c89b80e6208b4987bb76994e64c1e489.zip
Core: expose noConflict in AMD mode
- For compability reasons, we had already added the global in AMD mode, but without noConflict. This adds back noConflict to AMD (which fixes noConflict mode in the tests). Fixes gh-2930
Diffstat (limited to 'build/tasks')
-rw-r--r--build/tasks/build.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/build/tasks/build.js b/build/tasks/build.js
index 7f0da1d6b..1579691a0 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -17,7 +17,6 @@ module.exports = function( grunt ) {
read = function( fileName ) {
return grunt.file.read( srcFolder + fileName );
},
- globals = read( "exports/global.js" ),
wrapper = read( "wrapper.js" ).split( /\/\/ \@CODE\n\/\/[^\n]+/ ),
config = {
baseUrl: "src",
@@ -39,10 +38,7 @@ module.exports = function( grunt ) {
skipSemiColonInsertion: true,
wrap: {
start: wrapper[ 0 ].replace( /\/\*\s*eslint(?: |-).*\s*\*\/\n/, "" ),
- end: globals.replace(
- /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
- ""
- ) + wrapper[ 1 ]
+ end: wrapper[ 1 ]
},
rawText: {},
onBuildWrite: convert