Skip to content

Commit 807bb38

Browse files
robogeekrobogeek
committed
Cleanups
1 parent a5b2518 commit 807bb38

File tree

3 files changed

+23
-38
lines changed

3 files changed

+23
-38
lines changed

‎src/main/renderer.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ layouts['layout1.html'] = `
3333
<head>
3434
<title><%= title %></title>
3535
<style>
36-
h1 {
37-
color: red;
38-
}
39-
36+
H1, h2, h3, h4 { color: red; }
4037
pre {
4138
background: rgb(59, 58, 58);
4239
color: white;

‎src/renderer/components/EditorPage.vue‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,8 @@ export default {
159159
})
160160
});
161161
},
162-
saveContentToFile(file2save) {
163-
console.log(`saveContentToFile SAVING TO ${file2save}`);
164-
return new Promise((resolve, reject) => {
165-
fs.writeFile(file2save, this.input, 'utf8', (err) => {
166-
if (err) {
167-
reject(new Error(`saveContentToFile FAIL ${file2save} ${err.stack}`));
168-
} else {
169-
console.log(`saveContentToFile SUCCESS ${file2save}`);
170-
resolve("saved");
171-
}
172-
});
173-
});
162+
async saveContentToFile(file2save) {
163+
return await fs.writeFile(file2save, this.input, 'utf8');
174164
},
175165
saveAsGetFileName() {
176166
const remote = this.$electron.remote;
@@ -193,7 +183,9 @@ export default {
193183
let doit = await this.askSaveFile('UNTITLED');
194184
if (doit === "confirm") {
195185
let fileName = await this.saveAsGetFileName();
196-
await this.saveContentToFile(fileName);
186+
try { await this.saveContentToFile(fileName); } catch (e) {
187+
console.error(`openNewFile saveContentToFile FAIL because for ${fileName} ${e.stack}`);
188+
}
197189
}
198190
} else if (this.isChangedFile) {
199191
console.log(`openNewFile isChangedFile ${this.fileName}`);
@@ -244,7 +236,9 @@ export default {
244236
} else if (this.isChangedFile) {
245237
fileName = this.fileName;
246238
} else return;
247-
await this.saveContentToFile(fileName);
239+
try { await this.saveContentToFile(fileName); } catch (e) {
240+
console.error(`saveCurrentFile saveContentToFile FAIL for ${fileName} because ${e.stack}`);
241+
}
248242
this.isNewFile = false;
249243
this.isChangedFile = false;
250244
this.fileName = fileName;
@@ -256,13 +250,17 @@ export default {
256250
let doit = await this.askSaveFile('UNTITLED');
257251
if (doit === "confirm") {
258252
let fileName = await this.saveAsGetFileName();
259-
await this.saveContentToFile(fileName);
253+
try { await this.saveContentToFile(fileName); } catch (e) {
254+
console.error(`newFile2Edit saveContentToFile FAIL for ${fileName} because ${e.stack}`);
255+
}
260256
}
261257
} else if (this.isChangedFile) {
262258
console.log(`openNewFile isChangedFile ${this.fileName}`);
263259
let doit = await this.askSaveFile(this.fileName);
264260
if (doit === "confirm") {
265-
await this.saveContentToFile(this.fileName);
261+
try { await this.saveContentToFile(this.fileName); } catch (e) {
262+
console.error(`newFile2Edit saveContentToFile FAIL for ${fileName} because ${e.stack}`);
263+
}
266264
}
267265
}
268266
this.isNewFile = true;

‎src/renderer/main.js‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,53 +30,43 @@ export const messageBus = new Vue({
3030
newContentToRender(newContent) {
3131
ipcRenderer.send('newContentToRender', newContent);
3232
},
33-
newContentToPreview(url2preview) {
34-
this.$emit('newContentToPreview', url2preview);
35-
},
36-
newFile2Edit() { this.$emit('newFile2Edit'); },
37-
editorDoUndo() { this.$emit('editorDoUndo'); },
38-
editorDoRedo() { this.$emit('editorDoRedo'); },
39-
editorSelectAll() { this.$emit('editorSelectAll'); },
40-
openNewFile(file2open) {
41-
this.$emit('openNewFile', file2open);
42-
},
43-
saveCurrentFile() { this.$emit('saveCurrentFile'); }
33+
saveCurrentFile() { }
4434
}
4535
});
4636

4737
ipcRenderer.on('newContentToPreview', (event, url2preview) => {
4838
console.log(`ipcRenderer.on newContentToPreview ${util.inspect(event)} ${url2preview}`);
49-
messageBus.newContentToPreview(url2preview);
39+
messageBus.$emit('newContentToPreview', url2preview);
5040
});
5141

5242
ipcRenderer.on('newFile2Edit', (event) => {
5343
console.log(`ipcRenderer.on newFile2Edit ${util.inspect(event)}`);
54-
messageBus.newFile2Edit();
44+
messageBus.$emit('newFile2Edit');
5545
});
5646

5747
ipcRenderer.on('editorDoUndo', (event) => {
5848
console.log(`ipcRenderer.on editorDoUndo ${util.inspect(event)}`);
59-
messageBus.editorDoUndo();
49+
messageBus.$emit('editorDoUndo');
6050
});
6151

6252
ipcRenderer.on('editorDoRedo', (event) => {
6353
console.log(`ipcRenderer.on editorDoRedo ${util.inspect(event)}`);
64-
messageBus.editorDoRedo();
54+
messageBus.$emit('editorDoRedo');
6555
});
6656

6757
ipcRenderer.on('editorSelectAll', (event) => {
6858
console.log(`ipcRenderer.on editorSelectAll ${util.inspect(event)}`);
69-
messageBus.editorSelectAll();
59+
messageBus.$emit('editorSelectAll');
7060
});
7161

7262
ipcRenderer.on('openNewFile', (event, file2open) => {
7363
console.log(`ipcRenderer.on openNewFile ${util.inspect(file2open)}`);
74-
messageBus.openNewFile(file2open);
64+
messageBus.$emit('openNewFile', file2open);
7565
});
7666

7767
ipcRenderer.on('saveCurrentFile', (event) => {
7868
console.log(`ipcRenderer.on saveCurrentFile ${util.inspect(event)}`);
79-
messageBus.saveCurrentFile();
69+
messageBus.$emit('saveCurrentFile');
8070
});
8171

8272
/* eslint-disable no-new */

0 commit comments

Comments
 (0)