chore: update jQuery to 3.7.1 (fehmer) (#4649)

* chore: update jQuery to 3.7.1

* add version number to easing.js file

* review comments
This commit is contained in:
Christian Fehmer 2023-09-21 14:06:11 +02:00 committed by GitHub
parent fe8699399c
commit 3be55de92c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 51 additions and 44 deletions

View file

@ -16,7 +16,8 @@
"backend/setup-tests.ts",
"backend/jest.config.ts",
"**/*.css",
"**/*.scss"
"**/*.scss",
"frontend/static/js/*"
],
"extends": [
"eslint:recommended",

View file

@ -698,7 +698,7 @@ $(document).on("keydown", (e) => {
(e.key === "p" || e.key === "n" || e.key === "j" || e.key === "k"))
) {
e.preventDefault();
$("#commandLineWrapper #commandLine .suggestions .entry").unbind(
$("#commandLineWrapper #commandLine .suggestions .entry").off(
"mouseenter mouseleave"
);
const entries = $(".suggestions .entry");

View file

@ -820,7 +820,7 @@ function handleTab(event: JQuery.KeyDownEvent, popupVisible: boolean): void {
let lastBailoutAttempt = -1;
$(document).keydown(async (event) => {
$(document).on("keydown", async (event) => {
if (ActivePage.get() === "loading") return;
if (IgnoredKeys.includes(event.key)) return;
@ -1004,7 +1004,9 @@ $(document).keydown(async (event) => {
(f) => f.functions?.preventDefaultEvent
);
if (funbox?.functions?.preventDefaultEvent) {
if (await funbox.functions.preventDefaultEvent(event)) {
if (
await funbox.functions.preventDefaultEvent(event as JQuery.KeyDownEvent)
) {
event.preventDefault();
handleChar(event.key, TestInput.input.current.length);
updateUI();
@ -1037,7 +1039,7 @@ $(document).keydown(async (event) => {
isBackspace = event.key === "Backspace" || event.key === "delete";
});
$("#wordsInput").keydown((event) => {
$("#wordsInput").on("keydown", (event) => {
if (event.originalEvent?.repeat) {
console.log(
"spacing debug keydown STOPPED - repeat",
@ -1066,7 +1068,7 @@ $("#wordsInput").keydown((event) => {
}, 0);
});
$("#wordsInput").keyup((event) => {
$("#wordsInput").on("keyup", (event) => {
if (event.originalEvent?.repeat) {
console.log(
"spacing debug keydown STOPPED - repeat",
@ -1095,7 +1097,7 @@ $("#wordsInput").keyup((event) => {
}, 0);
});
$("#wordsInput").keyup((event) => {
$("#wordsInput").on("keyup", (event) => {
if (!event.originalEvent?.isTrusted || TestUI.testRestarting) {
event.preventDefault();
return;

View file

@ -734,7 +734,7 @@ languageSelector.on("select2:select", (e) => {
let leftScrollEnabled = true;
$("#leaderboardsWrapper #leaderboards .leftTableWrapper").scroll((e) => {
$("#leaderboardsWrapper #leaderboards .leftTableWrapper").on("scroll", (e) => {
if (!leftScrollEnabled) return;
const elem = $(e.currentTarget);
if (Math.round(elem.scrollTop() as number) <= 50) {
@ -744,7 +744,7 @@ $("#leaderboardsWrapper #leaderboards .leftTableWrapper").scroll((e) => {
const debouncedRequestMore = debounce(500, requestMore);
$("#leaderboardsWrapper #leaderboards .leftTableWrapper").scroll((e) => {
$("#leaderboardsWrapper #leaderboards .leftTableWrapper").on("scroll", (e) => {
if (!leftScrollEnabled) return;
const elem = $(e.currentTarget);
if (
@ -757,7 +757,7 @@ $("#leaderboardsWrapper #leaderboards .leftTableWrapper").scroll((e) => {
let rightScrollEnabled = true;
$("#leaderboardsWrapper #leaderboards .rightTableWrapper").scroll((e) => {
$("#leaderboardsWrapper #leaderboards .rightTableWrapper").on("scroll", (e) => {
if (!rightScrollEnabled) return;
const elem = $(e.currentTarget);
if (Math.round(elem.scrollTop() as number) <= 50) {
@ -765,7 +765,7 @@ $("#leaderboardsWrapper #leaderboards .rightTableWrapper").scroll((e) => {
}
});
$("#leaderboardsWrapper #leaderboards .rightTableWrapper").scroll((e) => {
$("#leaderboardsWrapper #leaderboards .rightTableWrapper").on("scroll", (e) => {
const elem = $(e.currentTarget);
if (
Math.round(elem[0].scrollHeight - (elem.scrollTop() as number)) <=

View file

@ -153,7 +153,7 @@ class Notification {
});
}
);
$(`#notificationCenter .notif[id='${this.id}']`).hover(() => {
$(`#notificationCenter .notif[id='${this.id}']`).on("hover", () => {
$(`#notificationCenter .notif[id='${this.id}']`).toggleClass("hover");
});
} else if (this.type === "banner") {

View file

@ -6,7 +6,7 @@ $(document).on("click", ".scrollToTopButton", () => {
window.scrollTo({ top: 0, behavior: "smooth" });
});
$(window).scroll(() => {
$(window).on("scroll", () => {
const page = ActivePage.get();
if (page === "test") return;
if (page === "about" || page === "settings" || page === "account") {

View file

@ -1109,7 +1109,8 @@ $(".pageSettings .section.customBackgroundSize .inputAndButton .save").on(
}
);
$(".pageSettings .section.customBackgroundSize .inputAndButton input").keypress(
$(".pageSettings .section.customBackgroundSize .inputAndButton input").on(
"keypress",
(e) => {
if (e.key === "Enter") {
UpdateConfig.setCustomBackground(
@ -1134,22 +1135,25 @@ $(".pageSettings .section.fontSize .inputAndButton .save").on("click", () => {
}
});
$(".pageSettings .section.fontSize .inputAndButton input").keypress((e) => {
if (e.key === "Enter") {
const didConfigSave = UpdateConfig.setFontSize(
parseFloat(
$(
".pageSettings .section.fontSize .inputAndButton input"
).val() as string
)
);
if (didConfigSave === true) {
Notifications.add("Saved", 1, {
duration: 1,
});
$(".pageSettings .section.fontSize .inputAndButton input").on(
"keypress",
(e) => {
if (e.key === "Enter") {
const didConfigSave = UpdateConfig.setFontSize(
parseFloat(
$(
".pageSettings .section.fontSize .inputAndButton input"
).val() as string
)
);
if (didConfigSave === true) {
Notifications.add("Saved", 1, {
duration: 1,
});
}
}
}
});
);
$(".pageSettings .section.customLayoutfluid .inputAndButton .save").on(
"click",
@ -1166,7 +1170,8 @@ $(".pageSettings .section.customLayoutfluid .inputAndButton .save").on(
}
);
$(".pageSettings .section.customLayoutfluid .inputAndButton .input").keypress(
$(".pageSettings .section.customLayoutfluid .inputAndButton .input").on(
"keypress",
(e) => {
if (e.key === "Enter") {
UpdateConfig.setCustomLayoutfluid(

View file

@ -17,7 +17,7 @@ export const page = new Page(
TestLogic.restart();
Funbox.clear();
ModesNotice.update();
$("#wordsInput").focusout();
$("#wordsInput").trigger("focusout");
},
async () => {
updateTestPageAds(true);

View file

@ -135,7 +135,7 @@ $("#customTestDurationPopupWrapper").on("click", (e) => {
}
});
$("#customTestDurationPopupWrapper input").keyup((e) => {
$("#customTestDurationPopupWrapper input").on("keyup", (e) => {
previewDuration();
if (e.key === "Enter") {

View file

@ -224,7 +224,7 @@ $("#quoteRatePopupWrapper").on("click", (e) => {
}
});
$("#quoteRatePopupWrapper .stars .star").hover((e) => {
$("#quoteRatePopupWrapper .stars .star").on("mouseenter mouseleave", (e) => {
const ratingHover = parseInt($(e.currentTarget).attr("rating") as string);
refreshStars(ratingHover);
});
@ -234,7 +234,7 @@ $("#quoteRatePopupWrapper .stars .star").on("click", (e) => {
rating = ratingHover;
});
$("#quoteRatePopupWrapper .stars .star").mouseout(() => {
$("#quoteRatePopupWrapper .stars .star").on("mouseout", () => {
$(`#quoteRatePopup .star`).removeClass("active");
refreshStars();
});

View file

@ -173,9 +173,7 @@ FunboxList.setFunboxFunctions("arrows", {
}
return false;
},
async preventDefaultEvent(
event: JQuery.KeyDownEvent<Document, null, Document, Document>
): Promise<boolean> {
async preventDefaultEvent(event: JQuery.KeyDownEvent): Promise<boolean> {
return ["ArrowLeft", "ArrowUp", "ArrowRight", "ArrowDown"].includes(
event.key
);

View file

@ -719,7 +719,7 @@ export async function update(
$(".pageTest #result #rateQuoteButton").addClass("hidden");
$("#testModesNotice").css("opacity", 0);
$("#words").removeClass("blurred");
$("#wordsInput").blur();
$("#wordsInput").trigger("blur");
$("#result .stats .time .bottom .afk").text("");
if (Auth?.currentUser) {
$("#result .loginTip").addClass("hidden");

View file

@ -276,7 +276,7 @@ export function restart(options = {} as RestartOptions): void {
LayoutfluidFunboxTimer.hide();
$("#showWordHistoryButton").removeClass("loaded");
$("#restartTestButton").blur();
$("#restartTestButton").trigger("blur");
MemoryFunboxTimer.reset();
QuoteRatePopup.clearQuoteStats();
// if (ActivePage.get() === "test" && window.scrollY > 0) {

View file

@ -164,7 +164,7 @@
</main>
</div>
</body>
<script src="js/jquery-3.5.1.min.js"></script>
<script src="js/jquery-3.7.1.min.js"></script>
<script src="/__/firebase/8.4.2/firebase-app.js"></script>
<script src="/__/firebase/8.4.2/firebase-analytics.js"></script>

View file

@ -0,0 +1,2 @@
/*! jQuery easing v1.4.1 */
(function(factory){if(typeof define==="function"&&define.amd){define(["jquery"],function($){return factory($)})}else if(typeof module==="object"&&typeof module.exports==="object"){exports=factory(require("jquery"))}else{factory(jQuery)}})(function($){$.easing.jswing=$.easing.swing;var pow=Math.pow,sqrt=Math.sqrt,sin=Math.sin,cos=Math.cos,PI=Math.PI,c1=1.70158,c2=c1*1.525,c3=c1+1,c4=2*PI/3,c5=2*PI/4.5;function bounceOut(x){var n1=7.5625,d1=2.75;if(x<1/d1){return n1*x*x}else if(x<2/d1){return n1*(x-=1.5/d1)*x+.75}else if(x<2.5/d1){return n1*(x-=2.25/d1)*x+.9375}else{return n1*(x-=2.625/d1)*x+.984375}}$.extend($.easing,{def:"easeOutQuad",swing:function(x){return $.easing[$.easing.def](x)},easeInQuad:function(x){return x*x},easeOutQuad:function(x){return 1-(1-x)*(1-x)},easeInOutQuad:function(x){return x<.5?2*x*x:1-pow(-2*x+2,2)/2},easeInCubic:function(x){return x*x*x},easeOutCubic:function(x){return 1-pow(1-x,3)},easeInOutCubic:function(x){return x<.5?4*x*x*x:1-pow(-2*x+2,3)/2},easeInQuart:function(x){return x*x*x*x},easeOutQuart:function(x){return 1-pow(1-x,4)},easeInOutQuart:function(x){return x<.5?8*x*x*x*x:1-pow(-2*x+2,4)/2},easeInQuint:function(x){return x*x*x*x*x},easeOutQuint:function(x){return 1-pow(1-x,5)},easeInOutQuint:function(x){return x<.5?16*x*x*x*x*x:1-pow(-2*x+2,5)/2},easeInSine:function(x){return 1-cos(x*PI/2)},easeOutSine:function(x){return sin(x*PI/2)},easeInOutSine:function(x){return-(cos(PI*x)-1)/2},easeInExpo:function(x){return x===0?0:pow(2,10*x-10)},easeOutExpo:function(x){return x===1?1:1-pow(2,-10*x)},easeInOutExpo:function(x){return x===0?0:x===1?1:x<.5?pow(2,20*x-10)/2:(2-pow(2,-20*x+10))/2},easeInCirc:function(x){return 1-sqrt(1-pow(x,2))},easeOutCirc:function(x){return sqrt(1-pow(x-1,2))},easeInOutCirc:function(x){return x<.5?(1-sqrt(1-pow(2*x,2)))/2:(sqrt(1-pow(-2*x+2,2))+1)/2},easeInElastic:function(x){return x===0?0:x===1?1:-pow(2,10*x-10)*sin((x*10-10.75)*c4)},easeOutElastic:function(x){return x===0?0:x===1?1:pow(2,-10*x)*sin((x*10-.75)*c4)+1},easeInOutElastic:function(x){return x===0?0:x===1?1:x<.5?-(pow(2,20*x-10)*sin((20*x-11.125)*c5))/2:pow(2,-20*x+10)*sin((20*x-11.125)*c5)/2+1},easeInBack:function(x){return c3*x*x*x-c1*x*x},easeOutBack:function(x){return 1+c3*pow(x-1,3)+c1*pow(x-1,2)},easeInOutBack:function(x){return x<.5?pow(2*x,2)*((c2+1)*2*x-c2)/2:(pow(2*x-2,2)*((c2+1)*(x*2-2)+c2)+2)/2},easeInBounce:function(x){return 1-bounceOut(1-x)},easeOutBounce:bounceOut,easeInOutBounce:function(x){return x<.5?(1-bounceOut(1-2*x))/2:(1+bounceOut(2*x-1))/2}})});

View file

@ -1 +0,0 @@
jQuery.easing.jswing=jQuery.easing.swing,jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(n,e,t,u,a){return jQuery.easing[jQuery.easing.def](n,e,t,u,a)},easeInQuad:function(n,e,t,u,a){return u*(e/=a)*e+t},easeOutQuad:function(n,e,t,u,a){return-u*(e/=a)*(e-2)+t},easeInOutQuad:function(n,e,t,u,a){return(e/=a/2)<1?u/2*e*e+t:-u/2*(--e*(e-2)-1)+t},easeInCubic:function(n,e,t,u,a){return u*(e/=a)*e*e+t},easeOutCubic:function(n,e,t,u,a){return u*((e=e/a-1)*e*e+1)+t},easeInOutCubic:function(n,e,t,u,a){return(e/=a/2)<1?u/2*e*e*e+t:u/2*((e-=2)*e*e+2)+t},easeInQuart:function(n,e,t,u,a){return u*(e/=a)*e*e*e+t},easeOutQuart:function(n,e,t,u,a){return-u*((e=e/a-1)*e*e*e-1)+t},easeInOutQuart:function(n,e,t,u,a){return(e/=a/2)<1?u/2*e*e*e*e+t:-u/2*((e-=2)*e*e*e-2)+t},easeInQuint:function(n,e,t,u,a){return u*(e/=a)*e*e*e*e+t},easeOutQuint:function(n,e,t,u,a){return u*((e=e/a-1)*e*e*e*e+1)+t},easeInOutQuint:function(n,e,t,u,a){return(e/=a/2)<1?u/2*e*e*e*e*e+t:u/2*((e-=2)*e*e*e*e+2)+t},easeInSine:function(n,e,t,u,a){return-u*Math.cos(e/a*(Math.PI/2))+u+t},easeOutSine:function(n,e,t,u,a){return u*Math.sin(e/a*(Math.PI/2))+t},easeInOutSine:function(n,e,t,u,a){return-u/2*(Math.cos(Math.PI*e/a)-1)+t},easeInExpo:function(n,e,t,u,a){return 0==e?t:u*Math.pow(2,10*(e/a-1))+t},easeOutExpo:function(n,e,t,u,a){return e==a?t+u:u*(1-Math.pow(2,-10*e/a))+t},easeInOutExpo:function(n,e,t,u,a){return 0==e?t:e==a?t+u:(e/=a/2)<1?u/2*Math.pow(2,10*(e-1))+t:u/2*(2-Math.pow(2,-10*--e))+t},easeInCirc:function(n,e,t,u,a){return-u*(Math.sqrt(1-(e/=a)*e)-1)+t},easeOutCirc:function(n,e,t,u,a){return u*Math.sqrt(1-(e=e/a-1)*e)+t},easeInOutCirc:function(n,e,t,u,a){return(e/=a/2)<1?-u/2*(Math.sqrt(1-e*e)-1)+t:u/2*(Math.sqrt(1-(e-=2)*e)+1)+t},easeInElastic:function(n,e,t,u,a){var r=1.70158,i=0,s=u;if(0==e)return t;if(1==(e/=a))return t+u;if(i||(i=.3*a),s<Math.abs(u)){s=u;r=i/4}else r=i/(2*Math.PI)*Math.asin(u/s);return-s*Math.pow(2,10*(e-=1))*Math.sin((e*a-r)*(2*Math.PI)/i)+t},easeOutElastic:function(n,e,t,u,a){var r=1.70158,i=0,s=u;if(0==e)return t;if(1==(e/=a))return t+u;if(i||(i=.3*a),s<Math.abs(u)){s=u;r=i/4}else r=i/(2*Math.PI)*Math.asin(u/s);return s*Math.pow(2,-10*e)*Math.sin((e*a-r)*(2*Math.PI)/i)+u+t},easeInOutElastic:function(n,e,t,u,a){var r=1.70158,i=0,s=u;if(0==e)return t;if(2==(e/=a/2))return t+u;if(i||(i=a*(.3*1.5)),s<Math.abs(u)){s=u;r=i/4}else r=i/(2*Math.PI)*Math.asin(u/s);return e<1?s*Math.pow(2,10*(e-=1))*Math.sin((e*a-r)*(2*Math.PI)/i)*-.5+t:s*Math.pow(2,-10*(e-=1))*Math.sin((e*a-r)*(2*Math.PI)/i)*.5+u+t},easeInBack:function(n,e,t,u,a,r){return null==r&&(r=1.70158),u*(e/=a)*e*((r+1)*e-r)+t},easeOutBack:function(n,e,t,u,a,r){return null==r&&(r=1.70158),u*((e=e/a-1)*e*((r+1)*e+r)+1)+t},easeInOutBack:function(n,e,t,u,a,r){return null==r&&(r=1.70158),(e/=a/2)<1?u/2*(e*e*((1+(r*=1.525))*e-r))+t:u/2*((e-=2)*e*((1+(r*=1.525))*e+r)+2)+t},easeInBounce:function(n,e,t,u,a){return u-jQuery.easing.easeOutBounce(n,a-e,0,u,a)+t},easeOutBounce:function(n,e,t,u,a){return(e/=a)<1/2.75?u*(7.5625*e*e)+t:e<2/2.75?u*(7.5625*(e-=1.5/2.75)*e+.75)+t:e<2.5/2.75?u*(7.5625*(e-=2.25/2.75)*e+.9375)+t:u*(7.5625*(e-=2.625/2.75)*e+.984375)+t},easeInOutBounce:function(n,e,t,u,a){return e<a/2?.5*jQuery.easing.easeInBounce(n,2*e,0,u,a)+t:.5*jQuery.easing.easeOutBounce(n,2*e-a,0,u,a)+.5*u+t}});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -60,9 +60,9 @@
</div>
</div>
</div>
<script src="/./js/jquery-3.5.1.min.js"></script>
<script src="/./js/jquery-3.7.1.min.js"></script>
<script src="/./js/jquery.color.min.js"></script>
<script src="/./js/easing.min.js"></script>
<script src="/./js/easing-1.4.1.min.js"></script>
<script src="/./js/html2canvas.min.js"></script>
<script src="/./js/select2.min.js"></script>
<script