From: Timmy Willison Date: Wed, 10 Feb 2016 21:47:25 +0000 (-0800) Subject: Build: use hard-coded path to sizzle in selector-sizzle X-Git-Tag: 2.2.1~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b536cd561ff1276f7094968aed2f1aa7d70bb5ae;p=jquery.git Build: use hard-coded path to sizzle in selector-sizzle Fixes gh-2898 --- diff --git a/build/tasks/build.js b/build/tasks/build.js index 74fa47fde..6825fc441 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -32,9 +32,6 @@ module.exports = function( grunt ) { startFile: "src/intro.js", endFile: [ "src/exports/global.js", "src/outro.js" ] }, - paths: { - sizzle: "../external/sizzle/dist/sizzle" - }, rawText: {}, onBuildWrite: convert }; @@ -59,7 +56,7 @@ module.exports = function( grunt ) { .replace( rdefineEnd, "" ); // Sizzle treatment - } else if ( /^sizzle$/.test( name ) ) { + } else if ( /\/sizzle$/.test( name ) ) { contents = "var Sizzle =\n" + contents // Remove EXPOSE lines from Sizzle diff --git a/src/selector-sizzle.js b/src/selector-sizzle.js index dcee45f37..9728a1f57 100644 --- a/src/selector-sizzle.js +++ b/src/selector-sizzle.js @@ -1,6 +1,6 @@ define( [ "./core", - "sizzle" + "../external/sizzle/dist/sizzle" ], function( jQuery, Sizzle ) { jQuery.find = Sizzle; diff --git a/test/jquery.js b/test/jquery.js index 233e696d9..8119d3fc0 100644 --- a/test/jquery.js +++ b/test/jquery.js @@ -18,10 +18,7 @@ // This detection allows AMD tests to be run in an iframe if ( QUnit.urlParams.amd && window.QUnit ) { require.config( { - baseUrl: path, - paths: { - sizzle: "external/sizzle/dist/sizzle" - } + baseUrl: path } ); src = "src/jquery";