diff --git a/src/Electron/html/about.html b/src/Electron/html/about.html index c718f19e..e8c83476 100644 --- a/src/Electron/html/about.html +++ b/src/Electron/html/about.html @@ -60,22 +60,6 @@

Jasper

window.close(); } }); - - // show devtool - let clickCount = 0; - document.querySelector('#icon').addEventListener('click', ()=>{ - clickCount++; - if (clickCount === 5) { - const fs = require('fs'); - const path = require('path'); - const app = require('electron').remote.app; - const remote = require('electron').remote; - const AppPath = remote.require('./AppPath').AppPath; - const dataPath = AppPath.getUserData(); - fs.writeFileSync(path.resolve(dataPath, '.debug'), ''); - alert('Welcome to Developer Mode. Please Relaunch Now.'); - } - }); diff --git a/src/Electron/html/logs/logs.html b/src/Electron/html/logs/logs.html deleted file mode 100644 index 2ee6cd5e..00000000 --- a/src/Electron/html/logs/logs.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Logs - - - - - - - - diff --git a/src/Electron/html/logs/logs.ts b/src/Electron/html/logs/logs.ts deleted file mode 100644 index 986b7d71..00000000 --- a/src/Electron/html/logs/logs.ts +++ /dev/null @@ -1,25 +0,0 @@ -const Logger = require('electron').remote.require('color-logger').default; -const logs = Logger.allLogs; -const fragment = document.createDocumentFragment(); -for (const log of logs) { - const el = document.createElement('li'); - el.textContent = log; - el.classList.add(logLevel(log)); - fragment.appendChild(el); -} - -const logsEl = document.querySelector('#logs'); -logsEl.appendChild(fragment); -logsEl.scrollTop = logsEl.scrollHeight; - -function logLevel(log) { - const level = log.match(/^.../)[0]; - switch (level) { - case '[N]': return 'level-normal'; - case '[D]': return 'level-debug'; - case '[E]': return 'level-error'; - case '[W]': return 'level-warning'; - case '[I]': return 'level-info'; - case '[V]': return 'level-verbose'; - } -} diff --git a/src/index.ts b/src/index.ts index 6b221723..2ec59398 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import Logger from 'color-logger'; import fs from 'fs-extra'; import electron from 'electron'; import Config from './Config'; -import File from './Util/File'; import Platform from './Util/Platform'; import BrowserViewProxy from './BrowserViewProxy'; import {AppPath} from './AppPath'; @@ -260,6 +259,13 @@ electron.app.on('ready', function() { {label: 'FAQ', click: ()=>{electron.shell.openExternal('https://jasperapp.io/faq.html')}}, {label: 'Feedback', click: ()=>{electron.shell.openExternal('https://github.com/jasperapp/jasper')}} ] + }, + { + label: 'Dev', + submenu: [ + {label: 'DevTools(Main)', click: ()=>{ mainWindow.webContents.openDevTools({mode: 'detach'}); }}, + {label: 'DevTools(BrowserView)', click: ()=>{ BrowserViewProxy.openDevTools({mode: 'detach'}); }}, + ] } ]; @@ -304,27 +310,14 @@ electron.app.on('ready', function() { {label: 'FAQ', click: ()=>{electron.shell.openExternal('https://jasperapp.io/faq.html')}}, {label: 'Feedback', click: ()=>{electron.shell.openExternal('https://github.com/jasperapp/jasper')}} ] - } - ]; - - if (File.isExist(`${userDataPath}/.debug`)) { - template.push({ - label: 'Dev', - submenu: [ - {label: 'DevTools(Main)', click: ()=>{ mainWindow.webContents.openDevTools({mode: 'detach'}); }}, - {label: 'DevTools(BrowserView)', click: ()=>{ BrowserViewProxy.openDevTools({mode: 'detach'}); }}, - {label: 'Logs', click: showLogs} - ] - }); - - minimumTemplate.push({ + }, + { label: 'Dev', submenu: [ {label: 'DevTools', click: ()=>{ mainWindow.webContents.openDevTools(); }}, - {label: 'Logs', click: showLogs} ] - }); - } + } + ]; appMenu = Menu.buildFromTemplate(template); Menu.setApplicationMenu(appMenu); @@ -657,28 +650,6 @@ function showPreferences() { prefWindow.setMenu(null); } -function showLogs() { - const logsWindow = new electron.BrowserWindow({ - title: 'Logs', - width: 800, - height: 600, - minimizable: false, - maximizable: false, - fullscreenable: false, - backgroundColor: "#e7e7e7", - parent: mainWindow, - webPreferences: { - nodeIntegration: true - } - }); - logsWindow.loadURL(`file://${__dirname}/Electron/html/logs/logs.html`); - logsWindow.on('closed', ()=>{ - Menu.setApplicationMenu(appMenu); - }); - - Menu.setApplicationMenu(minimumMenu); -} - function switchLayout(layout) { mainWindow.webContents.send('switch-layout', layout); require('./Util/GA').default.eventMenu(`layout:${layout}`);