]> source.dussan.org Git - jquery.git/commitdiff
Build: use hard-coded path to sizzle in selector-sizzle
authorTimmy Willison <timmywillisn@gmail.com>
Wed, 10 Feb 2016 21:47:25 +0000 (13:47 -0800)
committerTimmy Willison <timmywillisn@gmail.com>
Mon, 22 Feb 2016 15:43:47 +0000 (10:43 -0500)
Fixes gh-2898

build/tasks/build.js
src/selector-sizzle.js
test/jquery.js

index 664ccafe9e43dfb6c04257c2a0651c5884574b37..7034e8dd81f4a20de127439614e2e29c50b8c635 100644 (file)
@@ -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
index dcee45f37fd7f33ef187e4c8e945a1ee04a516cc..9728a1f57e4da19d6f4d0c121eca8e35d34de6b0 100644 (file)
@@ -1,6 +1,6 @@
 define( [
        "./core",
-       "sizzle"
+       "../external/sizzle/dist/sizzle"
 ], function( jQuery, Sizzle ) {
 
 jQuery.find = Sizzle;
index a595e3b4759bb75964564cce99f9c99809d0a770..e418a7e9ea40e71cbdc99af613a1a7e633a6bf0d 100644 (file)
        // 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";