From 5e13d867782c97563844d2b8ab966d34a0650a06 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Sun, 20 Oct 2019 20:57:22 +0900
Subject: [PATCH] Add: keyshortcut to search

---
 app/js/common/keyshortcut.js           | 10 ++++++++++
 app/view/make/language/en/setting.json |  2 +-
 app/view/make/language/ja/setting.json |  2 +-
 app/view/make/setting.sample.html      |  2 --
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/js/common/keyshortcut.js b/app/js/common/keyshortcut.js
index 4e98c45f..ab5aee52 100644
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -14,6 +14,16 @@ $(function ($) {
 		} else {
 			var wv = true;
 		}
+		//Enter
+		if (e.keyCode === 13) {
+			if($("#src").is(':focus')){
+				src()
+			}
+			if($("#list-add").is(':focus')){
+				makeNewList()
+			}
+			return false;
+		}
 		//Ctrl+Shift+Enter:Lgen
 		if (event.metaKey || event.ctrlKey && wv) {
 			if (event.shiftKey) {
diff --git a/app/view/make/language/en/setting.json b/app/view/make/language/en/setting.json
index a63fc6af..cc7b725e 100644
--- a/app/view/make/language/en/setting.json
+++ b/app/view/make/language/en/setting.json
@@ -27,7 +27,7 @@
   "fixwidthwarn": "",
   "above": "above",
   "font": "Font",
-  "fontwarn": "Select your favorite font to 'Select'(Windows/ macOS only)",
+  "fontwarn": "Select your favorite font to 'Select'(On Linux, it may not work.)",
   "fontsize": "Font size",
   "savefolder": "Folder to save",
   "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.",
diff --git a/app/view/make/language/ja/setting.json b/app/view/make/language/ja/setting.json
index 2a56a06c..e1b21155 100644
--- a/app/view/make/language/ja/setting.json
+++ b/app/view/make/language/ja/setting.json
@@ -27,7 +27,7 @@
   "fixwidthwarn": "",
   "above": "以上",
   "font": "フォント",
-  "fontwarn": "「選択」を押してフォントを選んでください。(Linuxでは動きません)",
+  "fontwarn": "「選択」を押してフォントを選んでください。(Linuxでは動かない場合があります。)",
   "fontsize": "フォントサイズ",
   "savefolder": "デフォルトの保存先",
   "savefolderwarn": "画像ダウンロードやスクリーンショットに影響します。",
diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html
index 42f5ab4f..7699cbba 100644
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -374,8 +374,6 @@
 				<i class="fab fa-spotify"></i>@@spotify@@
 			</div>
 			<div class="collapsible-body">
-				<br><br>
-				@@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br>
 				<h5>@@link@@</h5>
 				@@linkwarn@@<br>
 				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button