Merge pull request #41 from rolandbernard/devel

v0.0.27

.gitignore

@@ -3,5 +3,6 @@ dist/
 node_modules/
 thumbs.db
 .idea/
+.vim/
 
 todo.md

package.json

@@ -1,6 +1,6 @@
 {
     "name": "marvin",
-    "version": "0.0.26",
+    "version": "0.0.27",
     "license": "MIT",
     "scripts": {
         "dev": "electron-webpack dev",

src/main/index.js

@@ -3,7 +3,7 @@ import { app } from 'electron';
 import { loadConfig } from './config';
 import { initModules, deinitModules } from './executor';
 
-app.commandLine.appendSwitch("disable-gpu"); // Transparancy will not work without this
+app.commandLine.appendSwitch("disable-gpu"); // Transparency will not work without this
 
 async function startApp() {
     const got_single_instance_lock = app.requestSingleInstanceLock();

src/main/modules/main.js

@@ -13,14 +13,14 @@ let tray;
 
 let main_window;
 
-const MAX_TRANSFER_LEN = 200; // Text in the results sent to the renderer will be croped to this length.
+const MAX_TRANSFER_LEN = 200; // Text in the results sent to the renderer will be cropped to this length.
 
-// This stores the original_options because we only send croped text fields.
+// This stores the original_options because we only send cropped text fields.
 // (Fixes a performance issue when the clipboard contains a very long text)
 const original_option = new Map();
 
 // This variable is used to ensure that if a earlier query finishes after a later query, it will not
-// actualty sen the results to the renderer.
+// actually sen the results to the renderer.
 let execution_count = 0;
 
 function sendUpdatedOptions(id, sender, results) {
@@ -92,9 +92,6 @@ export function createMainWindow() {
     main_window.webContents.on('will-navigate', (e) => {
         e.preventDefault();
     });
-    main_window.webContents.on('new-window', (e) => {
-        e.preventDefault();
-    });
     main_window.on('close', hideWindow);
     if (!isDevelopment) {
         main_window.on('blur', hideWindow);

src/renderer/main/index.js

@@ -26,14 +26,14 @@ class App extends React.Component {
             clearTimeout(this.last_results);
             this.last_results = setTimeout(() => {
                 clearTimeout(this.last_loading);
-                this.setState({ results: options, selected: 0 });
+                this.setState({ results: options, selected: 0, center: true });
             }, this.state.config ? this.state.config.general.incremental_result_debounce : 20);
         });
         ipcRenderer.on('update-config', (_, config) => {
             this.setState({ config: config });
         });
         ipcRenderer.on('reset', (_) => {
-            this.setState({ results: [], selected: 0 });
+            this.setState({ results: [], selected: 0, center: true });
         });
     }
 
@@ -45,7 +45,7 @@ class App extends React.Component {
         }, this.state.config ? this.state.config.general.debounce_time : 20);
         clearTimeout(this.last_loading);
         this.last_loading = setTimeout(() => {
-            this.setState({ results: null, selected: 0 });
+            this.setState({ results: null, selected: 0, center: true });
         }, 200);
     }