Merge branch 'master_pdfpattern' #45

wtetsu · Aug 15, 2020 · 6a2bc87 · 6a2bc87
2 parents b8938e4 + a8537da
commit 6a2bc87
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/src/main/core/start.js b/src/main/core/start.js
@@ -37,7 +37,7 @@ const processFirstLaunch = async () => {
 
   const { settings, position } = await config.loadAll();
 
-  if (onPdfDocument(location.href, settings.pdfUrlPattern)) {
+  if (onPdfDocument(location.href, settings.pdfUrl)) {
     launchPdfViewer(settings);
     return;
   }
@@ -68,13 +68,10 @@ const launchPdfViewer = (settings) => {
 };
 
 const onPdfDocument = (url, pdfUrlPattern) => {
-  const e = document.body?.children?.[0];
-  if (e?.tagName === "EMBED" && e?.type === "application/pdf") {
-    return true;
-  }
-
   if (!pdfUrlPattern) {
-    return false;
+    const e = document.body?.children?.[0];
+    const embedPdf = e?.tagName === "EMBED" && e?.type === "application/pdf";
+    return embedPdf;
   }
 
   try {

diff --git a/src/main/settings/defaultsettings.js b/src/main/settings/defaultsettings.js
@@ -12,7 +12,7 @@ export default {
   initialPosition: "right",
   scroll: "scroll",
   skipPdfConfirmation: false,
-  pdfUrlPattern: "\\.(?:pdf|PDF)\\??[\\w-=&~]*$",
+  pdfUrl: "",
   backgroundColor: "#ffffff",
   headFontColor: "#000088",
   descFontColor: "#101010",

diff --git a/src/options/component/AdvancedSettings.tsx b/src/options/component/AdvancedSettings.tsx
@@ -19,7 +19,7 @@ type AdvancedSettingsProps = {
 export const AdvancedSettings: React.FC<AdvancedSettingsProps> = (props) => {
   const lookupWithCapitalized = props.settings?.lookupWithCapitalized ?? false;
   const parseWordsLimit = props.settings?.parseWordsLimit ?? 8;
-  const pdfUrlPattern = props.settings?.pdfUrlPattern ?? "";
+  const pdfUrl = props.settings?.pdfUrl ?? "";
   const contentWrapperTemplate = props.settings?.contentWrapperTemplate ?? "";
   const dialogTemplate = props.settings?.dialogTemplate ?? "";
   const contentTemplate = props.settings?.contentTemplate ?? "";
@@ -65,9 +65,10 @@ export const AdvancedSettings: React.FC<AdvancedSettingsProps> = (props) => {
         &nbsp;
         <input
           type="text"
-          value={pdfUrlPattern}
-          onChange={(e) => update({ pdfUrlPattern: e.target.value })}
+          value={pdfUrl}
+          onChange={(e) => update({ pdfUrl: e.target.value })}
           style={{ width: 600 }}
+          placeholder="\.pdf$"
         />
         <h3>
           {res.get("htmlTemplate")}

diff --git a/src/options/resource/en.ts b/src/options/resource/en.ts
@@ -88,5 +88,5 @@ export default {
   aboutJsonEditor:
     "This is JSON data which expresses the whole Mouse Dictionary's settings. Please use it for backup, sharing and so forth.",
   skipPdfConfirmation: "Skip PDF download confirmation",
-  pdfUrlPattern: "PDF URL pattern",
+  pdfUrlPattern: "Override PDF document judgment (regular expressions for URL)",
 };
diff --git a/src/options/resource/ja.ts b/src/options/resource/ja.ts
@@ -85,5 +85,5 @@ export default {
   aboutJsonEditor:
     "Mouse Dictionary設定全体のJSONデータです。バックアップや共有にご利用ください ※辞書データは含みません",
   skipPdfConfirmation: "PDFファイルのダウンロード確認を省略する",
-  pdfUrlPattern: "PDFドキュメントとみなすURLパターン",
+  pdfUrlPattern: "PDFドキュメント判定の上書き(URLに対する正規表現)",
 };
diff --git a/src/options/types.ts b/src/options/types.ts
@@ -29,7 +29,7 @@ export type MouseDictionaryAdvancedSettings = {
   contentWrapperTemplate: string;
   dialogTemplate: string;
   contentTemplate: string;
-  pdfUrlPattern: string;
+  pdfUrl: string;
 };
 
 export type InitialPosition = "left" | "right" | "keep";