Skip to content
This repository has been archived by the owner on Apr 22, 2022. It is now read-only.

Commit

Permalink
Fixed exit on Master Password screen
Browse files Browse the repository at this point in the history
Fixes #3072
  • Loading branch information
saenzramiro committed Aug 6, 2021
1 parent 1605ec5 commit 04413c8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions electron/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'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
const tray = require('./tray');
// AutoLaunch
Expand Down Expand Up @@ -233,7 +233,8 @@ function createMasterPasswordWindow() {
backgroundColor: '#0675A0'
,frame: false
,webPreferences: {
nodeIntegration: true
nodeIntegration: true
,enableRemoteModule: true
}
});
// Open the DevTools.
Expand Down
12 changes: 6 additions & 6 deletions masterpassword.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
function handlePaste(e) {
var clipboardData, pastedData;

// Stop data actually being pasted into div
e.stopPropagation();
e.preventDefault();
// Stop data actually being pasted into div
e.stopPropagation();
e.preventDefault();

// Get pasted data via clipboard API
clipboardData = e.clipboardData || window.clipboardData;
// Get pasted data via clipboard API
clipboardData = e.clipboardData || window.clipboardData;
pastedData = clipboardData.getData('Text');
document.getElementsByTagName('input')[0].value += pastedData
// Do whatever with pasteddata
// Do whatever with pasteddata
}
function doValidate(e, value) {
document.getElementById('wrong-pass').style.visibility = 'hidden'
Expand Down

0 comments on commit 04413c8

Please sign in to comment.