Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/PhieF/CarnetElectron.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhie <phie@phie.ovh>2020-04-15 15:01:43 +0300
committerPhie <phie@phie.ovh>2020-04-15 15:01:43 +0300
commit7f929d1c693fb15177f361deabfebe7caf5760ac (patch)
tree48151d027aba8a6b2a4009f36c2d90d674e19461 /settings
parenta8ebbac3330352eaa3fcf11ff676c5d65d50b5d9 (diff)
parent0cabde44238df892294fb6fa69b364868d71b4c8 (diff)
Merge branch 'new-importer'
Diffstat (limited to 'settings')
-rw-r--r--settings/settings.js58
1 files changed, 56 insertions, 2 deletions
diff --git a/settings/settings.js b/settings/settings.js
index 0ec26fb..d6a1014 100644
--- a/settings/settings.js
+++ b/settings/settings.js
@@ -1,4 +1,6 @@
+
$(document).ready(function () {
+ var frame;
var currentPath;
document.getElementById("select_note_path_button").onclick = function () {
if (compatibility.isElectron) {
@@ -142,7 +144,18 @@ $(document).ready(function () {
})
document.getElementById("import").onclick = function () {
- var {
+ const url = require('url')
+ const path = require('path')
+ frame.src = url.format({
+ pathname: path.join(__dirname, 'importer/importer.html'),
+ protocol: 'file:',
+ slashes: true
+ })
+ document.getElementById("frame-container").style.display = "block"
+ setTimeout(function () {
+ frame.openDevTools()
+ }, 1000)
+ /* var {
remote
} = require('electron');
const BrowserWindow = remote.BrowserWindow;
@@ -182,4 +195,45 @@ $(document).ready(function () {
for (var i = 0; i < dias.length; i++) {
dialogPolyfill.registerDialog(dias[i]);
}
-}) \ No newline at end of file
+ if (compatibility.isElectron) {
+ frame = document.getElementById("webview");
+ console.log("frame " + frame)
+ frame.addEventListener('ipc-message', event => {
+ if (events[event.channel] !== undefined) {
+ for (var callback of events[event.channel])
+ callback();
+ }
+ });
+ } else {
+ frame = document.getElementById("iframe");
+
+ var eventMethod = window.addEventListener ?
+ "addEventListener" :
+ "attachEvent";
+ var eventer = window[eventMethod];
+ var messageEvent = eventMethod === "attachEvent" ?
+ "onmessage" :
+ "message";
+ eventer(messageEvent, function (e) {
+ if (events[e.data] !== undefined) {
+ for (var callback of events[e.data])
+ callback();
+ }
+ });
+ }
+ var events = []
+ function registerWriterEvent(event, callback) {
+ if (events[event] == null) {
+ events[event] = []
+ }
+ events[event].push(callback)
+ }
+
+
+ registerWriterEvent("exit", function () {
+ document.getElementById("frame-container").style.display = "none"
+ })
+}
+)
+
+