]> 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:02 +0000 (10:43 -0500)
Fixes gh-2898

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

index 74fa47fde45cd34525445fa6fa85e63e9ffdb311..6825fc441986b793084494dbdda69caab8ab54f0 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 233e696d9df8354f1ff3d1899dc43b68034b54c8..8119d3fc042d342b6c8bca3c6002c009121d25ac 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";