Update 2 files

- /Live2dHistoire/live2d/js/message.js
- /_layouts/default.html

2 files changed, 19 insertions, 17 deletions

diff --git a/Live2dHistoire/live2d/js/message.js b/Live2dHistoire/live2d/js/message.js
index 4eb183f..68a6dba 100644
--- a/Live2dHistoire/live2d/js/message.js
+++ b/Live2dHistoire/live2d/js/message.js
@@ -192,7 +192,7 @@ if (!norunFlag) {
 		if (text instanceof EventSource) {
 			var outputContainer = $('.message')[0];
 			var eventFlag = false;
-			text.onmessage = (event) => {
+			text.onmessage = function(event) {
 				if (event.data == "[DONE]") {
 					text.close();
 					return;
@@ -202,7 +202,7 @@ if (!norunFlag) {
 						outputContainer.textContent = "";
 						eventFlag = true;
 					}
-					const data = JSON.parse(event.data);
+					var data = JSON.parse(event.data);
 					outputContainer.textContent += data.response;
 				}
 			}
@@ -272,7 +272,7 @@ if (!norunFlag) {
 				$('body').addClass(dataType);
 			}
 		});
-		if (talkAPI !== "") {
+		if (talkAPI !== "" && typeof EventSource !== 'undefined') {
 			$('#showInfoBtn').on('click', function () {
 				var live_statu = $('#live_statu_val').val();
 				if (live_statu == "0") {
@@ -299,7 +299,8 @@ if (!norunFlag) {
 
 				}
 			});
-			$('#talk_send').on('click', function () {
+			$('#live_talk_input_form').on('submit', function (e) {
+				e.preventDefault();
 				var info_ = $('#AIuserText').val();
 				// var userid_ = $('#AIuserName').val();
 				let add_id = "";
@@ -311,8 +312,7 @@ if (!norunFlag) {
 					return;
 				}
 				showMessage('思考中~', 0);
-				const evSource = new EventSource(talkAPI + "?info=" + encodeURIComponent(info_) + add_id);
-				showMessage(evSource);
+				showMessage(new EventSource(talkAPI + "?info=" + encodeURIComponent(info_) + add_id));
 			});
 		} else {
 			$('#showInfoBtn').hide();
diff --git a/_layouts/default.html b/_layouts/default.html
index 115e15d..0b7245a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -96,17 +96,19 @@
       <div class="message" style="opacity:0"></div>
       <canvas id="live2d" width="500" height="560" class="live2d"></canvas>
       <div class="live_talk_input_body">
-        <div class="live_talk_input_name_body" {% unless page.layout == "post" %}style="display:none;"{% endunless %}>
-          <input type="checkbox" id="load_this" />
-          <input type="hidden" id="post_id" value="{{ page.url }}" />
-          <label for="load_this">
-            <span style="font-size: 11px; color: #fff;">&nbsp;想问这篇文章</span>
-          </label>
-        </div>
-        <div class="live_talk_input_text_body">
-          <input name="talk" type="text" class="live_talk_talk white_input" id="AIuserText" autocomplete="off" placeholder="要和我聊什么呀？" />
-          <button type="button" class="live_talk_send_btn" id="talk_send">发送</button>
-        </div>
+        <form id="live_talk_input_form">
+          <div class="live_talk_input_name_body" {% unless page.layout == "post" %}style="display:none;"{% endunless %}>
+            <input type="checkbox" id="load_this" />
+            <input type="hidden" id="post_id" value="{{ page.url }}" />
+            <label for="load_this">
+              <span style="font-size: 11px; color: #fff;">&nbsp;想问这篇文章</span>
+            </label>
+          </div>
+          <div class="live_talk_input_text_body">
+            <input name="talk" type="text" class="live_talk_talk white_input" id="AIuserText" autocomplete="off" placeholder="要和我聊什么呀？" />
+            <button type="submit" class="live_talk_send_btn" id="talk_send">发送</button>
+          </div>
+        </form>
       </div>
       <input name="live_talk" id="live_talk" value="1" type="hidden" />
       <div class="live_ico_box" style="display:none;">