Minor misc changes

desktop/main.js

@@ -1,22 +1,24 @@
-const { app, BrowserWindow, webFrame, Menu } = require('electron')
+'use strict'
+
+/* global createWindow */
+
+const { app, BrowserWindow, Menu } = require('electron')
 const path = require('path')
-const url = require('url')
-const shell = require('electron').shell
 
 let isShown = true
 
 app.win = null
 
 app.on('ready', () => {
   app.win = new BrowserWindow({
-    width: 800,
-    height: 530,
-    minWidth: 310,
-    minHeight: 350,
+    width: 780,
+    height: 462,
+    minWidth: 380,
+    minHeight: 360,
     backgroundColor: '#000',
     icon: path.join(__dirname, { darwin: 'icon.icns', linux: 'icon.png', win32: 'icon.ico' }[process.platform] || 'icon.ico'),
     resizable: true,
-    frame: (process.argv.indexOf('frameless') == -1) && (process.platform !== 'darwin'),
+    frame: process.platform !== 'darwin',
     skipTaskbar: process.platform === 'darwin',
     autoHideMenuBar: process.platform === 'darwin',
     webPreferences: { zoomFactor: 1.0, nodeIntegration: true, backgroundThrottling: false }
@@ -26,7 +28,6 @@ app.on('ready', () => {
   // app.inspect()
 
   app.win.on('closed', () => {
-    win = null
     app.quit()
   })
 
@@ -59,11 +60,15 @@ app.toggleFullscreen = function () {
   app.win.setFullScreen(!app.win.isFullScreen())
 }
 
+app.toggleMenubar = function () {
+  app.win.setMenuBarVisibility(!app.win.isMenuBarVisible())
+}
+
 app.toggleVisible = function () {
-  if (process.platform === 'darwin') {
-    if (isShown && !app.win.isFullScreen()) { app.win.hide() } else { app.win.show() }
-  } else {
+  if (process.platform !== 'darwin') {
     if (!app.win.isMinimized()) { app.win.minimize() } else { app.win.restore() }
+  } else {
+    if (isShown && !app.win.isFullScreen()) { app.win.hide() } else { app.win.show() }
   }
 }
 

desktop/sources/left.js

@@ -86,13 +86,13 @@ function Left () {
     this.update()
   }
 
-  this.update = function (hard = false) {
-    const nextChar = left.textarea_el.value.substr(left.textarea_el.selectionEnd, 1)
+  this.update = (hard = false) => {
+    const nextChar = this.textarea_el.value.substr(this.textarea_el.selectionEnd, 1)
 
-    left.selection.word = this.active_word()
-    left.suggestion = (nextChar === '' || nextChar === ' ' || nextChar === EOL) ? left.dictionary.find_suggestion(left.selection.word) : null
-    left.synonyms = left.dictionary.find_synonym(left.selection.word)
-    left.selection.url = this.active_url()
+    this.selection.word = this.active_word()
+    this.suggestion = (nextChar === '' || nextChar === ' ' || nextChar === EOL) ? this.dictionary.find_suggestion(this.selection.word) : null
+    this.synonyms = this.dictionary.find_synonym(this.selection.word)
+    this.selection.url = this.active_url()
 
     this.project.update()
     this.navi.update()
@@ -101,28 +101,28 @@ function Left () {
 
   //
 
-  this.select_autocomplete = function () {
-    if (left.selection.word.trim() !== '' && left.suggestion && left.suggestion.toLowerCase() !== left.active_word().toLowerCase()) {
-      left.autocomplete()
+  this.select_autocomplete = () => {
+    if (this.selection.word.trim() !== '' && this.suggestion && this.suggestion.toLowerCase() !== this.active_word().toLowerCase()) {
+      this.autocomplete()
     } else {
-      left.inject('\u00a0\u00a0')
+      this.inject('\u00a0\u00a0')
     }
   }
 
-  this.select_synonym = function () {
-    if (left.synonyms) {
-      left.replace_active_word_with(left.synonyms[left.selection.index % left.synonyms.length])
-      left.stats.update()
-      left.selection.index = (left.selection.index + 1) % left.synonyms.length
+  this.select_synonym = () => {
+    if (this.synonyms) {
+      this.replace_active_word_with(this.synonyms[this.selection.index % this.synonyms.length])
+      this.stats.update()
+      this.selection.index = (this.selection.index + 1) % this.synonyms.length
     }
   }
 
-  this.select = function (from, to) {
-    left.textarea_el.setSelectionRange(from, to)
+  this.select = (from, to) => {
+    this.textarea_el.setSelectionRange(from, to)
   }
 
-  this.select_word = function (target) {
-    const from = left.textarea_el.value.split(target)[0].length
+  this.select_word = (target) => {
+    const from = this.textarea_el.value.split(target)[0].length
     this.select(from, from + target.length)
   }
 
@@ -155,7 +155,7 @@ function Left () {
     return this.textarea_el.value.substr(from, length)
   }
 
-  this.active_word_location = function (position = left.textarea_el.selectionEnd) {
+  this.active_word_location = (position = this.textarea_el.selectionEnd) => {
     let from = position - 1
 
     // Find beginning of word
@@ -182,20 +182,20 @@ function Left () {
     return { from: from, to: to }
   }
 
-  this.active_line_id = function () {
-    const segments = left.textarea_el.value.substr(0, left.textarea_el.selectionEnd).split(EOL)
+  this.active_line_id = () => {
+    const segments = this.textarea_el.value.substr(0, this.textarea_el.selectionEnd).split(EOL)
     return segments.length - 1
   }
 
-  this.active_line = function () {
-    const text = left.textarea_el.value
+  this.active_line = () => {
+    const text = this.textarea_el.value
     const lines = text.split(EOL)
     return lines[this.active_line_id()]
   }
 
-  this.active_word = function () {
+  this.active_word = () => {
     const l = this.active_word_location()
-    return left.textarea_el.value.substr(l.from, l.to - l.from)
+    return this.textarea_el.value.substr(l.from, l.to - l.from)
   }
 
   this.active_url = function () {
@@ -208,14 +208,14 @@ function Left () {
     return null
   }
 
-  this.prev_character = function () {
+  this.prev_character = () => {
     const l = this.active_word_location()
-    return left.textarea_el.value.substr(l.from - 1, 1)
+    return this.textarea_el.value.substr(l.from - 1, 1)
   }
 
-  this.replace_active_word_with = function (word) {
+  this.replace_active_word_with = (word) => {
     const l = this.active_word_location()
-    const w = left.textarea_el.value.substr(l.from, l.to - l.from)
+    const w = this.textarea_el.value.substr(l.from, l.to - l.from)
 
     // Preserve capitalization
     if (w.substr(0, 1) === w.substr(0, 1).toUpperCase()) {
@@ -280,8 +280,8 @@ function Left () {
     this.update()
   }
 
-  this.inject_line = function (characters = '__') {
-    left.select_line(left.active_line_id())
+  this.inject_line = (characters = '__') => {
+    this.select_line(this.active_line_id())
     this.inject(characters)
   }
 
@@ -295,8 +295,8 @@ function Left () {
     this.replace_selection_with(text)
   }
 
-  this.find = function (word) {
-    const text = left.textarea_el.value.toLowerCase()
+  this.find = (word) => {
+    const text = this.textarea_el.value.toLowerCase()
     const parts = text.split(word.toLowerCase())
     const a = []
     let sum = 0
@@ -312,8 +312,8 @@ function Left () {
     return a
   }
 
-  this.autocomplete = function () {
-    this.inject(left.suggestion.substr(left.selection.word.length, left.suggestion.length) + ' ')
+  this.autocomplete = () => {
+    this.inject(this.suggestion.substr(this.selection.word.length, this.suggestion.length) + ' ')
   }
 
   this.open_url = function (target = this.active_url()) {
@@ -323,10 +323,10 @@ function Left () {
     setTimeout(() => { require('electron').shell.openExternal(target) }, 500)
   }
 
-  this.reset = function () {
-    left.theme.reset()
-    left.font.reset()
-    left.update()
+  this.reset = () => {
+    this.theme.reset()
+    this.font.reset()
+    this.update()
   }
 }
 

desktop/sources/links/main.css

@@ -3,6 +3,7 @@
 :root { --font-size: 12px; --line-height: 20px; --font-family: 'custom_mono'; }
 
 ::-webkit-scrollbar { display: none; margin: 0; padding: 0; }
+
 body { height: 100vh; font-family: var(--font-family); font-size: 12px; overflow: auto; transition: background-color 500ms,filter 150ms; overflow: hidden;}
 body navi { display: block;width: calc((100vw / 4) - 40px);left: 0px;position: absolute;padding: 30px 0px 0px 30px; -webkit-user-select: none;-webkit-app-region: drag;overflow: auto;padding-top:30px;transition: opacity 200ms 200ms, translateY 150ms, width 200ms; opacity:1; height: calc(100vh - 120px); padding-bottom: 40px;}
 body navi li { display: flex; flex-direction: row; justify-content: space-between; align-items: center; line-height: 20px; cursor: pointer; position: relative; -webkit-app-region: no-drag; height:20px;}
@@ -13,7 +14,9 @@ body navi li.page {}
 body navi li.header { }
 body navi li.note { padding-left:15px;}
 body navi li.note::before { content:"#"; left:0px; }
-body navi li.comment {padding-left: 15px;}
+body navi li.subheader { padding-left: 15px;}
+body navi li.subheader::before { content:""; left:0px; }
+body navi li.comment { padding-left: 30px;}
 body navi li.comment::before { content:""; left:0px; }
 body navi li.changes::after { content:"*"; position: absolute; right: 15px; }
 body navi li i { padding-right:15px; }
@@ -39,7 +42,6 @@ body #operator { display: block;border-bottom: 0px;margin-top: 30px;position: fi
 body #operator.inactive { bottom:-40px; }
 body #operator.active { bottom:0px; }
 
-body {}
 * { background-color: inherit; }
 
 body.mobile navi { opacity:0; transition: opacity 10ms; }