diff --git a/package-lock.json b/package-lock.json
index 83b7c13f1..6842a978a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "trilium",
- "version": "0.24.2-beta",
+ "version": "0.24.3-beta",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -10821,9 +10821,9 @@
}
},
"ws": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz",
- "integrity": "sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
+ "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
"requires": {
"async-limiter": "~1.0.0"
}
diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js
index 6a041ab2f..9c5d9d76a 100644
--- a/src/public/javascripts/services/entrypoints.js
+++ b/src/public/javascripts/services/entrypoints.js
@@ -97,14 +97,19 @@ function registerEntrypoints() {
$(document).bind('keydown', 'ctrl+f', () => {
if (utils.isElectron()) {
- alert("In page search doesn't work in this beta");
+ const $searchWindowWebview = $(".electron-in-page-search-window");
+ $searchWindowWebview.show();
- // const searchInPage = require('electron-in-page-search').default;
- // const remote = require('electron').remote;
- //
- // const inPageSearch = searchInPage(remote.getCurrentWebContents());
- //
- // inPageSearch.openSearchWindow();
+ const searchInPage = require('electron-in-page-search').default;
+ const {remote} = require('electron');
+
+ const inPageSearch = searchInPage(remote.getCurrentWebContents(), {
+ searchWindowWebview: $searchWindowWebview[0],
+ //openDevToolsOfSearchWindow: true,
+ customCssPath: '/libraries/electron-in-page-search/default-style.css'
+ });
+
+ inPageSearch.openSearchWindow();
return false;
}
diff --git a/src/public/libraries/electron-in-page-search/default-style.css b/src/public/libraries/electron-in-page-search/default-style.css
new file mode 100644
index 000000000..8f784001b
--- /dev/null
+++ b/src/public/libraries/electron-in-page-search/default-style.css
@@ -0,0 +1,57 @@
+html, body {
+ margin: 0;
+ width: 100%;
+ height: 100%;
+}
+
+body {
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Meiryo", sans-serif;
+ overflow: hidden;
+}
+
+.inpage-search-body {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ margin: 8px;
+ padding: 10px;
+ border: solid #aaaaaa 1px;
+ border-radius: 10px;
+ background-color: #fafafa;
+}
+
+.inpage-search-input {
+ width: 200px;
+}
+
+.inpage-search-matches {
+ color: #999;
+ font-size: 0.8em;
+}
+
+.inpage-search-back {
+ margin-left: 2px;
+ padding-left: 6px;
+ padding-right: 2px;
+ cursor: pointer;
+}
+
+.inpage-search-forward {
+ padding-left: 2px;
+ padding-right: 6px;
+ cursor: pointer;
+}
+
+.inpage-search-close {
+ margin-left: 4px;
+ padding: 0 2px;
+ cursor: pointer;
+}
+
+.inpage-search-back:hover,
+.inpage-search-forward:hover,
+.inpage-search-close:hover {
+ background-color: #e2e0e2;
+ border-radius: 0.2em;
+}
diff --git a/src/public/libraries/electron-in-page-search/search-window.html b/src/public/libraries/electron-in-page-search/search-window.html
new file mode 100644
index 000000000..7ea687b9f
--- /dev/null
+++ b/src/public/libraries/electron-in-page-search/search-window.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
0/0
+
+
<
+
+
>
+
+
✕
+