Browse Source

Fixed exit on Master Password screen

Fixes #3072
pull/3102/head
Ramiro Saenz 4 years ago
parent
commit
04413c81eb
  1. 5
      electron/main.js
  2. 12
      masterpassword.html

5
electron/main.js

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const {app, protocol, BrowserWindow, dialog, shell, Menu, ipcMain, nativeImage, session} = require('electron'); const {app, BrowserWindow, shell, Menu, ipcMain, nativeImage, session} = require('electron');
// Tray // Tray
const tray = require('./tray'); const tray = require('./tray');
// AutoLaunch // AutoLaunch
@ -233,7 +233,8 @@ function createMasterPasswordWindow() {
backgroundColor: '#0675A0' backgroundColor: '#0675A0'
,frame: false ,frame: false
,webPreferences: { ,webPreferences: {
nodeIntegration: true nodeIntegration: true
,enableRemoteModule: true
} }
}); });
// Open the DevTools. // Open the DevTools.

12
masterpassword.html

@ -17,15 +17,15 @@
function handlePaste(e) { function handlePaste(e) {
var clipboardData, pastedData; var clipboardData, pastedData;
// Stop data actually being pasted into div // Stop data actually being pasted into div
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
// Get pasted data via clipboard API // Get pasted data via clipboard API
clipboardData = e.clipboardData || window.clipboardData; clipboardData = e.clipboardData || window.clipboardData;
pastedData = clipboardData.getData('Text'); pastedData = clipboardData.getData('Text');
document.getElementsByTagName('input')[0].value += pastedData document.getElementsByTagName('input')[0].value += pastedData
// Do whatever with pasteddata // Do whatever with pasteddata
} }
function doValidate(e, value) { function doValidate(e, value) {
document.getElementById('wrong-pass').style.visibility = 'hidden' document.getElementById('wrong-pass').style.visibility = 'hidden'

Loading…
Cancel
Save