Skip to content

Commit 7118294

Browse files
authored
Merge branch 'jquery:main' into master
2 parents 15f4870 + 0318a27 commit 7118294

File tree

10 files changed

+646
-612
lines changed

10 files changed

+646
-612
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
echo "dir=\"$(npm config get cache)\"" >> $GITHUB_OUTPUT
2929
3030
- name: Cache npm dependencies
31-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3232
with:
3333
path: ${{ steps.npm-cache-dir.outputs.dir }}
3434
key: ${{ runner.os }}-node-${{ matrix.node-version }}-npm-${{ hashFiles('**/package.json') }}

demos/autocomplete/multiple-remote.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
})
3131
.autocomplete({
3232
source: function( request, response ) {
33-
$.getJSON( "search.php", {
33+
$.getJSON( "search.json", {
3434
term: extractLast( request.term )
3535
}, response );
3636
},
@@ -58,6 +58,7 @@
5858
}
5959
});
6060
</script>
61+
<script src="../search.js"></script>
6162
</head>
6263
<body>
6364

demos/autocomplete/remote-jsonp.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$( "#birds" ).autocomplete({
2222
source: function( request, response ) {
2323
$.ajax( {
24-
url: "search.php",
24+
url: "search.json",
2525
dataType: "jsonp",
2626
data: {
2727
term: request.term
@@ -37,6 +37,7 @@
3737
}
3838
} );
3939
</script>
40+
<script src="../search.js"></script>
4041
</head>
4142
<body>
4243

demos/autocomplete/remote-with-cache.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
return;
2424
}
2525

26-
$.getJSON( "search.php", request, function( data, status, xhr ) {
26+
$.getJSON( "search.json", request, function( data, status, xhr ) {
2727
cache[ term ] = data;
2828
response( data );
2929
});
3030
}
3131
});
3232
</script>
33+
<script src="../search.js"></script>
3334
</head>
3435
<body>
3536

demos/autocomplete/remote.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919
}
2020

2121
$( "#birds" ).autocomplete({
22-
source: "search.php",
22+
source: "search.json",
2323
minLength: 2,
2424
select: function( event, ui ) {
2525
log( "Selected: " + ui.item.value + " aka " + ui.item.id );
2626
}
2727
});
2828
</script>
29+
<script src="../search.js"></script>
2930
</head>
3031
<body>
3132

0 commit comments

Comments
 (0)