Merge branch 'develop'

This commit is contained in:
varjolintu 2017-08-25 11:40:42 +03:00
commit cb18b4035c
21 changed files with 17 additions and 37 deletions

View file

@ -1,3 +1,7 @@
0.2.9 (2017-??-??)
=========================
- Code cleaning, global functions
0.2.8 (2017-08-08)
=========================
- Changed Firefox's minimum version to 55.0

View file

@ -7,7 +7,9 @@ For testing purposes, please use following unofficial KeePassXC [release's](http
Get the extension for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) or [Chrome/Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/iopaggbpplllidnfmcghoonnokmjoicf).
The extension is supported with Firefox 56.0a1 and newer. If you want to load it as a temporary plugin with Firefox 54 you can just change the minimum version from the manifest file before loading it.
The extension is supported with Firefox 55 and newer. If you want to load it as a temporary plugin with Firefox 54 you can just change the minimum version from the manifest file before loading it.
Please thee this [wiki page](https://github.com/varjolintu/keepassxc-browser/wiki/Connecting-the-database-with-current-beta-build) for instructions how to configure this KeePassXC fork in order to connect the database correctly.
## How it works
There are two methods which you can use keepassxc-browser to connect to KeePassXC:

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
var browserAction = {};
const BLINK_TIMEOUT_DEFAULT = 7500;

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
var event = {};
event.onMessage = function(request, sender, callback) {

View file

@ -7,8 +7,6 @@ keepass.changePublicKeys(null, (pkRes) => {
keepass.getDatabaseHash((gdRes) => {}, null);
});
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
// Set initial tab-ID
//browser.tabs.query({'active': true, 'windowId': browser.windows.WINDOW_ID_CURRENT}, (tabs) => {
browser.tabs.query({"active": true, "currentWindow": true}, (tabs) => {

View file

@ -20,8 +20,6 @@ keepass.keyRing = (typeof(localStorage.keyRing) === 'undefined') ? {} : JSON.par
keepass.keyId = 'keepassxc-browser-cryptokey-name';
keepass.keyBody = 'keepassxc-browser-key';
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
const kpActions = {
SET_LOGIN: 'set-login',
GET_LOGINS: 'get-logins',

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
const defaultSettings = {
checkUpdateKeePassXC: 3,
autoCompleteUsernames: true,

View file

@ -1,10 +1,3 @@
var isFirefox = false;
if (typeof browser !== 'undefined') {
isFirefox = true;
}
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
// Initialize autocomplete feature
$(this.target).find('input').autocomplete();
@ -804,6 +797,7 @@ cipFields.prepareId = function(id) {
cipFields.getAllFields = function() {
let fields = [];
// get all input fields which are text, email or password and visible
jQuery(cipFields.inputQueryPattern).each(function() {
if (jQuery(this).is(':visible') && jQuery(this).css('visibility') !== 'hidden' && jQuery(this).css('visibility') !== 'collapsed') {

View file

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "keepassxc-browser",
"version": "0.2.8",
"version": "0.2.9",
"description": "KeePassXC integration for modern web browsers",
"author": "Sami Vänttinen",
"icons": {
@ -24,6 +24,7 @@
},
"background": {
"scripts": [
"global.js",
"background/nacl.min.js",
"background/nacl-util.min.js",
"background/keepass.js",
@ -41,6 +42,7 @@
"https://*/*"
],
"js": [
"global.js",
"jquery-3.2.1.min.js",
"jquery-ui.min.js",
"keepassxc-browser.js"

View file

@ -5,6 +5,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="bootstrap.min.css" />
<link rel="stylesheet" href="options.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="bootstrap.min.js"></script>
<script type="text/javascript" src="options.js"></script>

View file

@ -1,10 +1,3 @@
var isFirefox = false;
if (typeof browser !== 'undefined') {
isFirefox = true;
}
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
if (jQuery) {
var $ = jQuery.noConflict(true);
}

View file

@ -4,6 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="popup.css" />
<link rel="stylesheet" href="../options/bootstrap.min.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../options/bootstrap.min.js" /></script>
<script type="text/javascript" src="popup_functions.js" /></script>

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
function status_response(r) {
$('#initial-state').hide();
$('#error-encountered').hide();

View file

@ -1,8 +1,5 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
var $ = jQuery.noConflict(true);
var _settings = typeof(localStorage.settings) ==='undefined' ? {} : JSON.parse(localStorage.settings);
//var global = browser.runtime.getBackgroundPage();
function updateAvailableResponse(available) {
if (available) {

View file

@ -4,6 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="popup.css" />
<link rel="stylesheet" href="../options/bootstrap.min.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../options/bootstrap.min.js" /></script>
<script type="text/javascript" src="popup_functions.js"></script>

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
$(function() {
browser.runtime.getBackgroundPage(function(global) {
browser.tabs.query({"active": true, "currentWindow": true}, (tab) => {

View file

@ -4,6 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="popup.css" />
<link rel="stylesheet" href="../options/bootstrap.min.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../options/bootstrap.min.js" /></script>
<script type="text/javascript" src="popup_functions.js"></script>

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
$(function() {
browser.runtime.getBackgroundPage(function(global) {
browser.tabs.query({"active": true, "currentWindow": true}, (tabs) => {

View file

@ -4,6 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="popup.css" />
<link rel="stylesheet" href="../options/bootstrap.min.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../options/bootstrap.min.js" /></script>
<script type="text/javascript" src="popup_functions.js"></script>

View file

@ -4,6 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="popup.css" />
<link rel="stylesheet" href="../options/bootstrap.min.css" />
<script type="text/javascript" src="../global.js"></script>
<script type="text/javascript" src="../jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../options/bootstrap.min.js" /></script>
<script type="text/javascript" src="popup_functions.js"></script>

View file

@ -1,5 +1,3 @@
window.browser = (function () { return window.msBrowser || window.browser || window.chrome; })();
var _tab;
function _initialize(tab) {