7x31
/
ChatGPT-Next-Web
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web

This commit is contained in:
GH Action - Upstream Sync 2024-03-20 00:25:18 +00:00
parent 87504b6c52 3ba984d09e
commit 92ead9ff61
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/chat.tsx
View File

@ -219,6 +219,8 @@ function useSubmitHandler() {
}, []); }, []);
const shouldSubmit = (e: React.KeyboardEvent<HTMLTextAreaElement>) => { const shouldSubmit = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
// Fix Chinese input method "Enter" on Safari
if (e.keyCode == 229) return false;
if (e.key !== "Enter") return false; if (e.key !== "Enter") return false;
if (e.key === "Enter" && (e.nativeEvent.isComposing || isComposing.current)) if (e.key === "Enter" && (e.nativeEvent.isComposing || isComposing.current))
return false; return false;

12
app/utils.ts
View File

@ -292,9 +292,11 @@ export function getMessageImages(message: RequestMessage): string[] {
} }
export function isVisionModel(model: string) { export function isVisionModel(model: string) {
return ( // Note: This is a better way using the TypeScript feature instead of `&&` or `||` (ts v5.5.0-dev.20240314 I've been using)
// model.startsWith("gpt-4-vision") || const visionKeywords = [
// model.startsWith("gemini-pro-vision") || "vision",
model.includes("vision") "claude-3",
); ];
return visionKeywords.some(keyword => model.includes(keyword));
} }