From dc15e6130472a751f0b2c994d86201b816d12df3 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 22 Oct 2017 17:52:55 +0300 Subject: [PATCH 01/24] Improved credentials check --- CHANGELOG | 4 + README.md | 240 +--------------------- keepassxc-browser/background/event.js | 4 +- keepassxc-browser/background/keepass.js | 4 + keepassxc-browser/background/page.js | 6 +- keepassxc-browser/keepassxc-browser.js | 13 +- keepassxc-browser/manifest.json | 2 +- keepassxc-protocol.md | 253 ++++++++++++++++++++++++ 8 files changed, 276 insertions(+), 250 deletions(-) create mode 100644 keepassxc-protocol.md diff --git a/CHANGELOG b/CHANGELOG index 58e4045..fa98f6f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.3.7 (22-10-2017) +========================= +- Improved credentials check (does not use protocol requests for polling) + 0.3.6 (20-10-2017) ========================= - Restricted page credentials polling to active tab diff --git a/README.md b/README.md index 892d330..a4d2392 100644 --- a/README.md +++ b/README.md @@ -37,245 +37,7 @@ The following improvements and features have been made after the fork. At this p ## Protocol -Transmitting messages between KeePassXC and keepassxc-browser is totally rewritten. This is still under development. -Now the requests are encrypted by [TweetNaCl.js](https://github.com/dchest/tweetnacl-js) box method and does the following: - -1. keepassxc-browser generates a key pair (with public and secret key) and transfers the public key to KeePassXC -2. When KeePassXC receives the public key it generates its own key pair and transfers the public key to keepassxc-browser -3. All messages between the browser extension and KeePassXC are now encrypted. -4. When keepassxc-browser sends a message it is encrypted with KeePassXC's public key, a random generated nonce and keepassxc-browser's secret key. -5. When KeePassXC sends a message it is encrypted with keepassxc-browser's public key etc. -6. Databases are stored based on the current public key used with `associate`. A new key pair for data transfer is generated each time keepassxc-browser is launched. - -Encrypted messages are built with these JSON parameters: -- action - `test-associate`, `associate`, `get-logins`, `get-logins-count`, `set-login`... -- message - Encrypted message, base64 encoded -- nonce - 24 bytes long random data, base64 encoded. This must be the same when responding to a request. -- clientID - 24 bytes long random data, base64 encoded. This is used to identify different browsers if multiple are used with proxy application. - -### change-public-keys -Request: -```javascript -{ - "action": "change-public-keys", - "publicKey": "", - "proxyPort": "", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response (success): -```javascript -{ - "action": "change-public-keys", - "version": "2.2.0", - "publicKey": "", - "success": "true" -} -``` - -### get-databasehash -Request (unencrypted): -```javascript -{ - "action": "get-databasehash" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "action": "hash", - "hash": "29234e32274a32276e25666a42", - "version": "2.2.0" -} -``` - -### associate -Unencrypted message: -```javascript -{ - "action": "associate", - "key": "" -} -``` - -Request: -```javascript -{ - "action": "associate", - "message": encryptedMessage - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "hash": "29234e32274a32276e25666a42", - "version": "2.2.0", - "success": "true", - "id": "testclient", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" -} -``` - -### test-associate -Unencrypted message: -```javascript -{ - "action": "test-associate", - "id": "", - "key": "", - "clientID": "" -} -``` - -Request: -```javascript -{ - "action": "test-associate", - "message": encryptedMessage - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "version": "2.2.0", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "hash": "29234e32274a32276e25666a42", - "id": "testclient", - "success": "true" -} -``` - -### generate-password -Request: -```javascript -{ - "action": "generate-password", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "version": "2.2.0", - "entries": [ - { - "login": 144, - "password": "testclientpassword" - } - ], - "success": "true", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" -} -``` - -### get-logins -Unencrypted message: -```javascript -{ - "action": "get-logins", - "url": "", - "submitUrl": optional -} -``` - -Request: -```javascript -{ - "action": "get-logins", - "message": encryptedMessage - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "count": "2", - "entries" : [ - { - "login": "user1", - "name": "user1", - "password": "passwd1" - }, - { - "login": "user2", - "name": "user2", - "password": "passwd2" - }], - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "success": "true", - "hash": "29234e32274a32276e25666a42", - "version": "2.2.0" -} -``` - -### set-login -Unencrypted message: -```javascript -{ - "action": "set-login", - "url": "", - "submitUrl": "", - "id": "testclient", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "login": "user1", - "password": "passwd1" -} -``` - -Request: -```javascript -{ - "action": "set-login", - "message": encryptedMessage - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response message data (success, decrypted): -```javascript -{ - "count": null, - "entries" : null, - "error": "", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "success": "true", - "hash": "29234e32274a32276e25666a42", - "version": "2.2.0" -} -``` - -### lock-database -Request: -```javascript -{ - "action": "lock-database", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", - "clientID": "" -} -``` - -Response message data (success always returns an error, decrypted): -```javascript -{ - "action": "lock-database", - "errorCode": 1, - "error": "Database not opened", - "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" -} -``` +The details about the messaging protocol used with the browser extension and KeePassXC can be found [here](https://github.com/varjolintu/keepassxc-browser/blob/master/keepassxc-protocol.md). ## Licenses diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index a0de69b..2b0a440 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -72,7 +72,7 @@ kpxcEvent.invoke = function(handler, callback, senderTabId, args, secondTime) { else { console.log('undefined handler for tab ' + tab.id); } - }); + }).catch((e) => {console.log(e);}); }; kpxcEvent.onShowAlert = function(callback, tab, message) { @@ -240,7 +240,7 @@ kpxcEvent.pageClearLogins = function(callback, tab) { kpxcEvent.oldDatabaseHash = 'no-hash'; kpxcEvent.checkDatabaseHash = function(callback, tab) { - keepass.getDatabaseHash((response) => { + keepass.checkDatabaseHash((response) => { callback({old: kpxcEvent.oldDatabaseHash, new: response}); kpxcEvent.oldDatabaseHash = response; }); diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 69fb55b..39be7cb 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -632,6 +632,10 @@ keepass.isConfigured = function(callback) { } }; +keepass.checkDatabaseHash = function(callback, tab) { + callback(keepass.databaseHash); +}; + keepass.isAssociated = function() { return (keepass.associated.value && keepass.associated.hash && keepass.associated.hash === keepass.databaseHash); }; diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js index 8ffd51e..d6ee9fc 100644 --- a/keepassxc-browser/background/page.js +++ b/keepassxc-browser/background/page.js @@ -66,7 +66,7 @@ page.isValidProtocol = function(url) { page.switchTab = function(callback, tab) { browserAction.showDefault(null, tab); - browser.tabs.sendMessage(tab.id, {action: 'activated_tab'}).catch((e) => {console.log(e);}); + browser.tabs.sendMessage(tab.id, {action: 'activated_tab'}).catch((e) => {}); }; page.clearCredentials = function(tabId, complete) { @@ -82,7 +82,7 @@ page.clearCredentials = function(tabId, complete) { browser.tabs.sendMessage(tabId, { action: 'clear_credentials' - }).catch((e) => {console.log(e);}); + }).catch((e) => {}); } }; @@ -101,7 +101,7 @@ page.createTabEntry = function(tabId) { page.removePageInformationFromNotExistingTabs = function() { let rand = Math.floor(Math.random()*1001); if (rand === 28) { - browser.tabs.query({}, (tabs) => { + browser.tabs.query({}).then(function(tabs) { let $tabIds = {}; const $infoIds = Object.keys(page.tabs); diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index 34e2b5c..af6ecbc 100644 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -46,9 +46,11 @@ browser.runtime.onMessage.addListener(function(req, sender, callback) { } else if (req.action === 'clear_credentials') { cipEvents.clearCredentials(); + callback(); } else if (req.action === 'activated_tab') { cipEvents.triggerActivatedTab(); + callback(); } else if (req.action === 'redetect_fields') { browser.runtime.sendMessage({ @@ -254,7 +256,7 @@ cipPassword.createDialog = function() { e.preventDefault(); browser.runtime.sendMessage({ action: 'generate_password' - }).then(cipPassword.callbackGeneratedPassword); + }).then(cipPassword.callbackGeneratedPassword).catch((e) => {console.log(e);}); } }, 'Copy': @@ -1129,6 +1131,7 @@ cip.detectNewActiveFields = function() { //} }; +// Try to do this in a way that database value if checked without polling the KeePassXC.. too many messages jumping around // Switch credentials if database is changed or closed cip.detectDatabaseChange = function() { const dbDetectInterval = setInterval(function() { @@ -1157,9 +1160,9 @@ cip.detectDatabaseChange = function() { }); } } - }); + }).catch((e) => {console.log(e);}); } - }, 2000); + }, 1000); }; cip.initCredentialFields = function(forceCall) { @@ -1193,7 +1196,7 @@ cip.initCredentialFields = function(forceCall) { browser.runtime.sendMessage({ action: 'retrieve_credentials', args: [ cip.url, cip.submitUrl ] - }).then(cip.retrieveCredentialsCallback); + }).then(cip.retrieveCredentialsCallback).catch((e) => {console.log(e);}); } }); }; @@ -1747,6 +1750,6 @@ cipEvents.triggerActivatedTab = function() { browser.runtime.sendMessage({ action: 'retrieve_credentials', args: [ cip.url, cip.submitUrl ] - }).then(cip.retrieveCredentialsCallback); + }).then(cip.retrieveCredentialsCallback).catch((e) => {console.log(e);}); } }; diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index e8b4412..9d8273b 100644 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "keepassxc-browser", - "version": "0.3.6", + "version": "0.3.7", "description": "KeePassXC integration for modern web browsers", "author": "Sami Vänttinen", "icons": { diff --git a/keepassxc-protocol.md b/keepassxc-protocol.md new file mode 100644 index 0000000..872bd08 --- /dev/null +++ b/keepassxc-protocol.md @@ -0,0 +1,253 @@ +## keepassxc-protocol + +Transmitting messages between KeePassXC and keepassxc-browser is totally rewritten. This is still under development. +Now the requests are encrypted by [TweetNaCl.js](https://github.com/dchest/tweetnacl-js) box method and does the following: + +1. keepassxc-browser generates a key pair (with public and secret key) and transfers the public key to KeePassXC +2. When KeePassXC receives the public key it generates its own key pair and transfers the public key to keepassxc-browser +3. All messages between the browser extension and KeePassXC are now encrypted. +4. When keepassxc-browser sends a message it is encrypted with KeePassXC's public key, a random generated nonce and keepassxc-browser's secret key. +5. When KeePassXC sends a message it is encrypted with keepassxc-browser's public key etc. +6. Databases are stored based on the current public key used with `associate`. A new key pair for data transfer is generated each time keepassxc-browser is launched. + +Encrypted messages are built with these JSON parameters: +- action - `test-associate`, `associate`, `get-logins`, `get-logins-count`, `set-login`... +- message - Encrypted message, base64 encoded +- nonce - 24 bytes long random data, base64 encoded. This must be the same when responding to a request. +- clientID - 24 bytes long random data, base64 encoded. This is used to identify different browsers if multiple are used with proxy application. + +Currently these messages are implemented: +- `change-public-keys`: Request for passing public keys from client to server and back. +- `get-databasehash`: Request for receiving the database hash (SHA256) of the current active database. +- `associate`: Request for associating a new client with KeePassXC. +- `test-associate`: Request for testing if the client has been associated with KeePassXC. +- `generate-password`: Request for generating a password. KeePassXC's settings are used. +- `get-logins`: Requests for receiving credentials for the current URL match. +- `set-login`: Request for adding or updating credentials to the database. +- `lock-database`: Request for locking the database from client. +- `database-locked`: A signal from KeePassXC, the current active database is locked. +- `database-unlocked`: A signal from KeePassXC, the current active database is unlocked. + +### change-public-keys +Request: +```javascript +{ + "action": "change-public-keys", + "publicKey": "", + "proxyPort": "", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response (success): +```javascript +{ + "action": "change-public-keys", + "version": "2.2.0", + "publicKey": "", + "success": "true" +} +``` + +### get-databasehash +Request (unencrypted): +```javascript +{ + "action": "get-databasehash" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "action": "hash", + "hash": "29234e32274a32276e25666a42", + "version": "2.2.0" +} +``` + +### associate +Unencrypted message: +```javascript +{ + "action": "associate", + "key": "" +} +``` + +Request: +```javascript +{ + "action": "associate", + "message": encryptedMessage + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "hash": "29234e32274a32276e25666a42", + "version": "2.2.0", + "success": "true", + "id": "testclient", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" +} +``` + +### test-associate +Unencrypted message: +```javascript +{ + "action": "test-associate", + "id": "", + "key": "", + "clientID": "" +} +``` + +Request: +```javascript +{ + "action": "test-associate", + "message": encryptedMessage + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "version": "2.2.0", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "hash": "29234e32274a32276e25666a42", + "id": "testclient", + "success": "true" +} +``` + +### generate-password +Request: +```javascript +{ + "action": "generate-password", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "version": "2.2.0", + "entries": [ + { + "login": 144, + "password": "testclientpassword" + } + ], + "success": "true", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" +} +``` + +### get-logins +Unencrypted message: +```javascript +{ + "action": "get-logins", + "url": "", + "submitUrl": optional +} +``` + +Request: +```javascript +{ + "action": "get-logins", + "message": encryptedMessage + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "count": "2", + "entries" : [ + { + "login": "user1", + "name": "user1", + "password": "passwd1" + }, + { + "login": "user2", + "name": "user2", + "password": "passwd2" + }], + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "success": "true", + "hash": "29234e32274a32276e25666a42", + "version": "2.2.0" +} +``` + +### set-login +Unencrypted message: +```javascript +{ + "action": "set-login", + "url": "", + "submitUrl": "", + "id": "testclient", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "login": "user1", + "password": "passwd1" +} +``` + +Request: +```javascript +{ + "action": "set-login", + "message": encryptedMessage + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response message data (success, decrypted): +```javascript +{ + "count": null, + "entries" : null, + "error": "", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "success": "true", + "hash": "29234e32274a32276e25666a42", + "version": "2.2.0" +} +``` + +### lock-database +Request: +```javascript +{ + "action": "lock-database", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", + "clientID": "" +} +``` + +Response message data (success always returns an error, decrypted): +```javascript +{ + "action": "lock-database", + "errorCode": 1, + "error": "Database not opened", + "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" +} +``` \ No newline at end of file From c40fdb3bbdb6d63cafdb6ad55b17231656ba0734 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 22 Oct 2017 17:53:51 +0300 Subject: [PATCH 02/24] README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4d2392..f3e6922 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The following improvements and features have been made after the fork. At this p ## Protocol -The details about the messaging protocol used with the browser extension and KeePassXC can be found [here](https://github.com/varjolintu/keepassxc-browser/blob/master/keepassxc-protocol.md). +The details about the messaging protocol used with the browser extension and KeePassXC can be found [here](keepassxc-protocol.md). ## Licenses From 7139fa0077971adf6a6eb42097e46dd532693025 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 30 Oct 2017 11:19:26 +0200 Subject: [PATCH 03/24] Switched localStorage to browser.local.storage --- keepassxc-browser/background/browserAction.js | 2 +- keepassxc-browser/background/event.js | 53 ++++++----- keepassxc-browser/background/init.js | 18 ++-- keepassxc-browser/background/keepass.js | 88 +++++++++++-------- keepassxc-browser/background/page.js | 78 ++++++++-------- keepassxc-browser/keepassxc-browser.js | 12 +-- keepassxc-browser/options/options.js | 32 +++---- 7 files changed, 158 insertions(+), 125 deletions(-) diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js index 3a67a12..34547a5 100644 --- a/keepassxc-browser/background/browserAction.js +++ b/keepassxc-browser/background/browserAction.js @@ -70,7 +70,7 @@ browserAction.showDefault = function(callback, tab) { iconType: 'normal', popup: 'popup.html' }; - keepass.isConfigured((response) => { + keepass.isConfigured().then((response) => { if (!response || keepass.isDatabaseClosed || !keepass.isKeePassXCAvailable || page.tabs[tab.id].errorMessage) { stackData.iconType = 'cross'; } diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index 2b0a440..d4af4e4 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -100,32 +100,37 @@ kpxcEvent.showStatus = function(configured, tab, callback) { }; kpxcEvent.onLoadSettings = function(callback, tab) { - page.settings = (typeof(localStorage.settings) === 'undefined') ? {} : JSON.parse(localStorage.settings); + browser.storage.local.get({'settings': {}}).then((item) => { + callback(item.settings); + }, (err) => { + console.log('error loading settings: ' + err); + }); }; kpxcEvent.onLoadKeyRing = function(callback, tab) { - keepass.keyRing = (typeof(localStorage.keyRing) === 'undefined') ? {} : JSON.parse(localStorage.keyRing); - if (keepass.isAssociated() && !keepass.keyRing[keepass.associated.hash]) { - keepass.associated = { - value: false, - hash: null - }; - } -}; - -kpxcEvent.onGetSettings = function(callback, tab) { - kpxcEvent.onLoadSettings(); - callback({ data: page.settings }); + browser.storage.local.get({'keyRing': {}}).then(function(item) { + keepass.keyRing = item.keyRing; + if (keepass.isAssociated() && !keepass.keyRing[keepass.associated.hash]) { + keepass.associated = { + "value": false, + "hash": null + }; + } + callback(item.keyRing); + }, (err) => { + console.log('error loading keyRing: ' + err); + }); }; kpxcEvent.onSaveSettings = function(callback, tab, settings) { - localStorage.settings = JSON.stringify(settings); - kpxcEvent.onLoadSettings(); + browser.storage.local.set({'settings': settings}).then(function() { + kpxcEvent.onLoadSettings(); + }); }; kpxcEvent.onGetStatus = function(callback, tab) { keepass.testAssociation((response) => { - keepass.isConfigured((configured) => { + keepass.isConfigured().then((configured) => { kpxcEvent.showStatus(configured, tab, callback); }); }, tab, true); @@ -141,7 +146,7 @@ kpxcEvent.onReconnect = function(callback, tab) { keepass.getDatabaseHash((gdRes) => { if (gdRes) { keepass.testAssociation((response) => { - keepass.isConfigured((configured) => { + keepass.isConfigured().then((configured) => { kpxcEvent.showStatus(configured, tab, callback); }); }, tab); @@ -175,12 +180,13 @@ kpxcEvent.onGetConnectedDatabase = function(callback, tab) { }; kpxcEvent.onGetKeePassXCVersions = function(callback, tab) { - if (keepass.currentKeePassXC.version === 0) { - keepass.getDatabaseHash((response) => { - callback({current: keepass.currentKeePassXC.version, latest: keepass.latestKeePassXC.version}); - }, tab); - } - callback({current: keepass.currentKeePassXC.version, latest: keepass.latestKeePassXC.version}); + if(keepass.currentKeePassXC.version == 0) { + keepass.getDatabaseHash(tab).then(() => { + callback({"current": keepass.currentKeePassXC.version, "latest": keepass.currentKeePassXC.version}); + }); + } else { + callback({"current": keepass.currentKeePassXC.version, "latest": keepass.currentKeePassXC.version}); +} }; kpxcEvent.onCheckUpdateKeePassXC = function(callback, tab) { @@ -254,7 +260,6 @@ kpxcEvent.messageHandlers = { 'check_update_keepassxc': kpxcEvent.onCheckUpdateKeePassXC, 'get_connected_database': kpxcEvent.onGetConnectedDatabase, 'get_keepassxc_versions': kpxcEvent.onGetKeePassXCVersions, - 'get_settings': kpxcEvent.onGetSettings, 'get_status': kpxcEvent.onGetStatus, 'get_tab_information': kpxcEvent.onGetTabInformation, 'load_keyring': kpxcEvent.onLoadKeyRing, diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js index 6bc33c1..fa369a9 100644 --- a/keepassxc-browser/background/init.js +++ b/keepassxc-browser/background/init.js @@ -1,13 +1,15 @@ -keepass.convertKeyToKeyRing(); -page.initSettings(); -page.initOpenedTabs(); -keepass.connectToNative(); -keepass.generateNewKeyPair(); -keepass.changePublicKeys(null, (pkRes) => { - keepass.getDatabaseHash((gdRes) => {}, null); +keepass.migrateKeyRing().then(() => { + page.initSettings().then(() => { + page.initOpenedTabs().then(() => { + keepass.connectToNative(); + keepass.generateNewKeyPair(); + keepass.changePublicKeys(null, (pkRes) => { + keepass.getDatabaseHash((gdRes) => {}, null); + }); + }); + }); }); - // Milliseconds for intervall (e.g. to update browserAction) let _interval = 250; diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 39be7cb..5b80f13 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -11,7 +11,6 @@ keepass.isDatabaseClosed = false; keepass.isKeePassXCAvailable = false; keepass.isEncryptionKeyUnrecognized = false; keepass.currentKeePassXC = {'version': 0, 'versionParsed': 0}; -keepass.latestKeePassXC = (typeof(localStorage.latestKeePassXC) === 'undefined') ? {'version': 0, 'versionParsed': 0, 'lastChecked': null} : JSON.parse(localStorage.latestKeePassXC); keepass.requiredKeePassXC = 220; keepass.nativeHostName = 'com.varjolintu.keepassxc_browser'; keepass.nativePort = null; @@ -77,6 +76,13 @@ const kpErrors = { } }; +browser.storage.local.get({ + 'latestKeePassXC': {'version': 0, 'versionParsed': 0, 'lastChecked': null}, + 'keyRing': {}}).then((item) => { + keepass.latestKeePassXC = item.latestKeePassXC; + keepass.keyRing = item.keyRing; +}); + keepass.addCredentials = function(callback, tab, username, password, url) { keepass.updateCredentials(callback, tab, null, username, password, url); }; @@ -621,15 +627,16 @@ keepass.generateNewKeyPair = function() { //console.log(keepass.b64e(keepass.keyPair.publicKey) + ' ' + keepass.b64e(keepass.keyPair.secretKey)); }; -keepass.isConfigured = function(callback) { - if (typeof(keepass.databaseHash) === 'undefined') { - keepass.getDatabaseHash((dbHash) => { - callback(keepass.databaseHash in keepass.keyRing); - }, null); - } - else { - callback(keepass.databaseHash in keepass.keyRing); - } +keepass.isConfigured = function() { + return new Promise((resolve, reject) => { + if (typeof(keepass.databaseHash) === 'undefined') { + keepass.getDatabaseHash().then((hash) => { + resolve(hash in keepass.keyRing); + }); + } else { + resolve(keepass.databaseHash in keepass.keyRing); + } + }); }; keepass.checkDatabaseHash = function(callback, tab) { @@ -640,22 +647,33 @@ keepass.isAssociated = function() { return (keepass.associated.value && keepass.associated.hash && keepass.associated.hash === keepass.databaseHash); }; -keepass.convertKeyToKeyRing = function() { - if (keepass.keyId in localStorage && keepass.keyBody in localStorage && !('keyRing' in localStorage)) { - keepass.getDatabaseHash((hash) => { - keepass.saveKey(hash, localStorage[keepass.keyId], localStorage[keepass.keyBody]); - - if ('keyRing' in localStorage) { - delete localStorage[keepass.keyId]; - delete localStorage[keepass.keyBody]; +keepass.migrateKeyRing = function() { + return new Promise((resolve, reject) => { + browser.storage.local.get('keyRing').then((item) => { + const keyring = item.keyRing; + // change dates to numbers, for compatibilty with chrome + if (keyring) { + let num = 0; + for (let keyHash in keyring) { + let key = keyring[keyHash]; + ['created', 'lastUsed'].forEach((fld) => { + let v = key[fld]; + if (v instanceof Date && v.valueOf() >= 0) { + key[fld] = v.valueOf(); + num++; + } else if (typeof v !== 'number') { + key[fld] = Date.now().valueOf(); + num++; + } + }); + } + if (num > 0) { + browser.storage.local.set({ keyRing: keyring }); + } } - }, null); - } - - if ('keyRing' in localStorage) { - delete localStorage[keepass.keyId]; - delete localStorage[keepass.keyBody]; - } + resolve(); + }); + }); }; keepass.saveKey = function(hash, id, key) { @@ -664,8 +682,8 @@ keepass.saveKey = function(hash, id, key) { id: id, key: key, hash: hash, - created: new Date(), - lastUsed: new Date() + created: new Date().valueOf(), + lastUsed: new Date().valueOf() }; } else { @@ -673,19 +691,19 @@ keepass.saveKey = function(hash, id, key) { keepass.keyRing[hash].key = key; keepass.keyRing[hash].hash = hash; } - localStorage.keyRing = JSON.stringify(keepass.keyRing); + browser.storage.local.set({'keyRing': keepass.keyRing}); }; keepass.updateLastUsed = function(hash) { if ((hash in keepass.keyRing)) { - keepass.keyRing[hash].lastUsed = new Date(); - localStorage.keyRing = JSON.stringify(keepass.keyRing); + keepass.keyRing[hash].lastUsed = new Date().valueOf(); + browser.storage.local.set({'keyRing': keepass.keyRing}); } }; keepass.deleteKey = function(hash) { delete keepass.keyRing[hash]; - localStorage.keyRing = JSON.stringify(keepass.keyRing); + browser.storage.local.set({'keyRing': keepass.keyRing}); }; keepass.setcurrentKeePassXCVersion = function(version) { @@ -699,7 +717,7 @@ keepass.setcurrentKeePassXCVersion = function(version) { keepass.keePassXCUpdateAvailable = function() { if (page.settings.checkUpdateKeePassXC && page.settings.checkUpdateKeePassXC > 0) { - const lastChecked = (keepass.latestKeePassXC.lastChecked) ? new Date(keepass.latestKeePassXC.lastChecked) : new Date('11/21/1986'); + const lastChecked = (keepass.latestKeePassXC.lastChecked) ? new Date(keepass.latestKeePassXC.lastChecked) : new Date(1986, 11, 21); const daysSinceLastCheck = Math.floor(((new Date()).getTime()-lastChecked.getTime())/86400000); if (daysSinceLastCheck >= page.settings.checkUpdateKeePassXC) { keepass.checkForNewKeePassXCVersion(); @@ -724,7 +742,7 @@ keepass.checkForNewKeePassXCVersion = function() { } if (version !== -1) { - localStorage.latestKeePassXC = JSON.stringify(keepass.latestKeePassXC); + browser.storage.local.set({'latestKeePassXC': keepass.latestKeePassXC}); } }; @@ -739,7 +757,7 @@ keepass.checkForNewKeePassXCVersion = function() { catch (ex) { console.log(ex); } - keepass.latestKeePassXC.lastChecked = new Date(); + keepass.latestKeePassXC.lastChecked = new Date().valueOf(); }; keepass.connectToNative = function() { @@ -749,7 +767,7 @@ keepass.connectToNative = function() { }; keepass.onNativeMessage = function(response) { - //console.log('Received message: ' + JSON.stringify(response)); + console.log('Received message: ' + JSON.stringify(response)); // Handle database lock/unlock status if (response.action === kpActions.DATABASE_LOCKED || response.action === kpActions.DATABASE_UNLOCKED) { diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js index d6ee9fc..8e868d3 100644 --- a/keepassxc-browser/background/page.js +++ b/keepassxc-browser/background/page.js @@ -10,50 +10,56 @@ const defaultSettings = { var page = {}; page.tabs = {}; - page.currentTabId = -1; -page.settings = (typeof(localStorage.settings) === 'undefined') ? {} : JSON.parse(localStorage.settings); page.blockedTabs = {}; page.initSettings = function() { - kpxcEvent.onLoadSettings(); - if (!('checkUpdateKeePassXC' in page.settings)) { - page.settings.checkUpdateKeePassXC = defaultSettings.checkUpdateKeePassXC; - } - if (!('autoCompleteUsernames' in page.settings)) { - page.settings.autoCompleteUsernames = defaultSettings.autoCompleteUsernames; - } - if (!('autoFillAndSend' in page.settings)) { - page.settings.autoFillAndSend = defaultSettings.autoFillAndSend; - } - if (!('usePasswordGenerator' in page.settings)) { - page.settings.usePasswordGenerator = defaultSettings.usePasswordGenerator; - } - if (!('autoFillSingleEntry' in page.settings)) { - page.settings.autoFillSingleEntry = defaultSettings.autoFillSingleEntry; - } - if (!('autoRetrieveCredentials' in page.settings)) { - page.settings.autoRetrieveCredentials = defaultSettings.autoRetrieveCredentials; - } - if (!('port' in page.settings)) { - page.settings.port = defaultSettings.proxyPort; - } - localStorage.settings = JSON.stringify(page.settings); + return new Promise((resolve, reject) => { + kpxcEvent.onLoadSettings((settings) => { + page.settings = settings; + if (!('checkUpdateKeePassXC' in page.settings)) { + page.settings.checkUpdateKeePassXC = defaultSettings.checkUpdateKeePassXC; + } + if (!('autoCompleteUsernames' in page.settings)) { + page.settings.autoCompleteUsernames = defaultSettings.autoCompleteUsernames; + } + if (!('autoFillAndSend' in page.settings)) { + page.settings.autoFillAndSend = defaultSettings.autoFillAndSend; + } + if (!('usePasswordGenerator' in page.settings)) { + page.settings.usePasswordGenerator = defaultSettings.usePasswordGenerator; + } + if (!('autoFillSingleEntry' in page.settings)) { + page.settings.autoFillSingleEntry = defaultSettings.autoFillSingleEntry; + } + if (!('autoRetrieveCredentials' in page.settings)) { + page.settings.autoRetrieveCredentials = defaultSettings.autoRetrieveCredentials; + } + if (!('port' in page.settings)) { + page.settings.port = defaultSettings.proxyPort; + } + browser.storage.local.set({'settings': page.settings}); + resolve(); + }); + }); }; page.initOpenedTabs = function() { - browser.tabs.query({}).then((tabs) => { - for (const i of tabs) { - page.createTabEntry(i.id); - } - - // set initial tab-ID - browser.tabs.query({ "active": true, "currentWindow": true }).then((tabs) => { - if (tabs.length === 0) { - return; // For example: only the background devtools or a popup are opened + return new Promise((resolve, reject) => { + browser.tabs.query({}).then((tabs) => { + for (const i of tabs) { + page.createTabEntry(i.id); } - page.currentTabId = tabs[0].id; - browserAction.show(null, tabs[0]); + + // set initial tab-ID + browser.tabs.query({ "active": true, "currentWindow": true }).then((tabs) => { + if (tabs.length === 0) { + return; // For example: only the background devtools or a popup are opened + } + page.currentTabId = tabs[0].id; + browserAction.show(null, tabs[0]); + resolve(); + }); }); }); }; diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index af6ecbc..41962ac 100644 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -54,7 +54,7 @@ browser.runtime.onMessage.addListener(function(req, sender, callback) { } else if (req.action === 'redetect_fields') { browser.runtime.sendMessage({ - action: 'get_settings', + action: 'load_settings', }).then((response) => { cip.settings = response.data; cip.initCredentialFields(true); @@ -1109,9 +1109,9 @@ jQuery(function() { cip.init = function() { browser.runtime.sendMessage({ - action: 'get_settings', + action: 'load_settings', }).then((response) => { - cip.settings = response.data; + cip.settings = response; cip.initCredentialFields(); }); }; @@ -1134,7 +1134,7 @@ cip.detectNewActiveFields = function() { // Try to do this in a way that database value if checked without polling the KeePassXC.. too many messages jumping around // Switch credentials if database is changed or closed cip.detectDatabaseChange = function() { - const dbDetectInterval = setInterval(function() { + let dbDetectInterval = setInterval(function() { if (document.visibilityState !== 'hidden') { browser.runtime.sendMessage({ action: 'check_databasehash' @@ -1153,9 +1153,9 @@ cip.detectDatabaseChange = function() { } else { if (response.new !== 'no-hash' && response.new !== response.old) { browser.runtime.sendMessage({ - action: 'get_settings', + action: 'load_settings', }).then((response) => { - cip.settings = response.data; + cip.settings = response; cip.initCredentialFields(true); }); } diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index 446ccb2..6328a29 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -3,18 +3,21 @@ if (jQuery) { } $(function() { - options.initMenu(); - options.initGeneralSettings(); - options.initConnectedDatabases(); - options.initSpecifiedCredentialFields(); - options.initAbout(); + browser.runtime.sendMessage({ action: 'load_settings' }).then((settings) => { + options.settings = settings; + browser.runtime.sendMessage({ action: 'load_keyring' }).then((keyRing) => { + options.keyRing = keyRing; + options.initMenu(); + options.initGeneralSettings(); + options.initConnectedDatabases(); + options.initSpecifiedCredentialFields(); + options.initAbout(); + }); + }); }); var options = options || {}; -options.settings = typeof(localStorage.settings) === 'undefined' ? {} : JSON.parse(localStorage.settings); -options.keyRing = typeof(localStorage.keyRing) === 'undefined' ? {} : JSON.parse(localStorage.keyRing); - options.initMenu = function() { $('.navbar:first ul.nav:first li a').click(function(e) { e.preventDefault(); @@ -32,22 +35,21 @@ options.saveSetting = function(name) { $($id).closest('.control-group').removeClass('error').addClass('success'); setTimeout(() => { $($id).closest('.control-group').removeClass('success'); }, 2500); - localStorage.settings = JSON.stringify(options.settings); - + browser.storage.local.set({'settings': options.settings}); browser.runtime.sendMessage({ action: 'load_settings' }); }; options.saveSettings = function() { - localStorage.settings = JSON.stringify(options.settings); + browser.storage.local.set({'settings': options.settings}); browser.runtime.sendMessage({ action: 'load_settings' }); }; options.saveKeyRing = function() { - localStorage.keyRing = JSON.stringify(options.keyRing); + browser.storage.local.set({'keyRing': options.keyRing}); browser.runtime.sendMessage({ action: 'load_keyring' }); @@ -107,7 +109,7 @@ options.initGeneralSettings = function() { $('#blinkTimeoutButton').click(function(){ const blinkTimeout = $.trim($('#blinkTimeout').val()); const blinkTimeoutval = Number(blinkTimeout); - + options.settings['blinkTimeout'] = String(blinkTimeoutval); options.saveSetting('blinkTimeout'); }); @@ -115,7 +117,7 @@ options.initGeneralSettings = function() { $('#blinkMinTimeoutButton').click(function(){ const blinkMinTimeout = $.trim($('#blinkMinTimeout').val()); const blinkMinTimeoutval = Number(blinkMinTimeout); - + options.settings['blinkMinTimeout'] = String(blinkMinTimeoutval); options.saveSetting('blinkMinTimeout'); }); @@ -123,7 +125,7 @@ options.initGeneralSettings = function() { $('#allowedRedirectButton').click(function(){ const allowedRedirect = $.trim($('#allowedRedirect').val()); const allowedRedirectval = Number(allowedRedirect); - + options.settings['allowedRedirect'] = String(allowedRedirectval); options.saveSetting('allowedRedirect'); }); From b1ea0b180b9e97173a5bff3c0b368b996297ea6c Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 30 Oct 2017 12:29:38 +0200 Subject: [PATCH 04/24] New sendNativeMessage implementation --- keepassxc-browser/background/event.js | 2 +- keepassxc-browser/background/keepass.js | 107 ++++++++++++------------ 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index d4af4e4..caf36e3 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -148,7 +148,7 @@ kpxcEvent.onReconnect = function(callback, tab) { keepass.testAssociation((response) => { keepass.isConfigured().then((configured) => { kpxcEvent.showStatus(configured, tab, callback); - }); + }).catch((e) => {console.log(e);}); }, tab); } }, null); diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 5b80f13..78cfe98 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -122,9 +122,8 @@ keepass.updateCredentials = function(callback, tab, entryId, username, password, nonce: keepass.b64e(nonce), clientID: keepass.clientID }; - console.log(request); - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -140,7 +139,6 @@ keepass.updateCredentials = function(callback, tab, entryId, username, password, browserAction.showDefault(null, tab); } }); - keepass.nativePort.postMessage(request); }); }; @@ -186,7 +184,7 @@ keepass.retrieveCredentials = function(callback, tab, url, submiturl, forceCallb clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -216,40 +214,47 @@ keepass.retrieveCredentials = function(callback, tab, url, submiturl, forceCallb browserAction.showDefault(null, tab); } }); - keepass.nativePort.postMessage(request); }, tab); }; -// Redirects the callback to a listener (handleReply()) -keepass.callbackOnId = function(ev, action, tab, callback, enableTimeout = false) { - let timeout; - let listener = ((port, action) => { - let handler = (msg) => { - if (msg && msg.action === action) { - ev.removeListener(handler); - if (enableTimeout) { - clearTimeout(timeout); - } - callback(msg); - } - }; - return handler; - })(ev, action, tab, callback); - ev.addListener(listener); +keepass.sendNativeMessage = function(request, enableTimeout = false) { + return new Promise((resolve, reject) => { + let timeout; + let action = request.action; + let ev = keepass.nativePort.onMessage; - // Handle timeouts - if (enableTimeout) { - timeout = setTimeout(() => { - const errorMessage = { - action: action, - error: kpErrors.getError(5), - errorCode: 5 + let listener = ((port, action) => { + let handler = (msg) => { + if (msg && msg.action === action) { + port.removeListener(handler); + if (enableTimeout) { + clearTimeout(timeout); + } + resolve(msg); + } }; - keepass.isKeePassXCAvailable = false; - callback(errorMessage); - ev.removeListener(listener.handler); - }, keepass.messageTimeout); - } + return handler; + })(ev, action); + ev.addListener(listener); + + + // Handle timeouts + if (enableTimeout) { + timeout = setTimeout(() => { + const errorMessage = { + action: action, + error: kpErrors.getError(kpErrors.TIMEOUT_OR_NOT_CONNECTED), + errorCode: kpErrors.TIMEOUT_OR_NOT_CONNECTED + }; + keepass.isKeePassXCAvailable = false; + ev.removeListener(listener.handler); + resolve(errorMessage); + }, keepass.messageTimeout); + } + + // Send the request + keepass.nativePort.postMessage(request); + }); }; keepass.generatePassword = function(callback, tab, forceCallback) { @@ -283,10 +288,10 @@ keepass.generatePassword = function(callback, tab, forceCallback) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); - if (res) { + if (res) { const message = nacl.util.encodeUTF8(res); const parsed = JSON.parse(message); keepass.setcurrentKeePassXCVersion(parsed.version); @@ -310,7 +315,6 @@ keepass.generatePassword = function(callback, tab, forceCallback) { keepass.handleError(tab, response.errorCode, response.error); } }); - keepass.nativePort.postMessage(request); }, tab); }; @@ -344,7 +348,7 @@ keepass.associate = function(callback, tab) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -369,7 +373,6 @@ keepass.associate = function(callback, tab) { keepass.handleError(tab, response.errorCode, response.error); } }); - keepass.nativePort.postMessage(request); }, tab); }; @@ -427,7 +430,7 @@ keepass.testAssociation = function(callback, tab, enableTimeout = false) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request, enableTimeout).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -459,7 +462,6 @@ keepass.testAssociation = function(callback, tab, enableTimeout = false) { } callback(keepass.isAssociated()); }); - keepass.nativePort.postMessage(request); }, tab, enableTimeout); }; @@ -495,7 +497,7 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request, enableTimeout).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -536,8 +538,7 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { } callback(keepass.databaseHash); } - }, enableTimeout); - keepass.nativePort.postMessage(request); + }); }; keepass.changePublicKeys = function(tab, callback) { @@ -552,7 +553,7 @@ keepass.changePublicKeys = function(tab, callback) { nonce = keepass.b64e(nonce); keepass.clientID = keepass.b64e(nacl.randomBytes(keepass.keySize)); - const message = { + const request = { action: kpAction, publicKey: key, proxyPort: (page.settings.port ? page.settings.port : 19700), @@ -560,7 +561,7 @@ keepass.changePublicKeys = function(tab, callback) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { keepass.setcurrentKeePassXCVersion(response.version); if (!keepass.verifyKeyResponse(response, key, nonce)) { @@ -575,7 +576,6 @@ keepass.changePublicKeys = function(tab, callback) { } callback(true); }); - keepass.nativePort.postMessage(message); }; keepass.lockDatabase = function(callback, tab, forceCallback) { @@ -599,7 +599,7 @@ keepass.lockDatabase = function(callback, tab, forceCallback) { clientID: keepass.clientID }; - keepass.callbackOnId(keepass.nativePort.onMessage, kpAction, tab, (response) => { + keepass.sendNativeMessage(request).then((response) => { if (response.message && response.nonce) { const res = keepass.decrypt(response.message, response.nonce); if (res) { @@ -619,7 +619,6 @@ keepass.lockDatabase = function(callback, tab, forceCallback) { } callback(false); }); - keepass.nativePort.postMessage(request); }; keepass.generateNewKeyPair = function() { @@ -651,7 +650,7 @@ keepass.migrateKeyRing = function() { return new Promise((resolve, reject) => { browser.storage.local.get('keyRing').then((item) => { const keyring = item.keyRing; - // change dates to numbers, for compatibilty with chrome + // Change dates to numbers, for compatibilty with Chromium based browsers if (keyring) { let num = 0; for (let keyHash in keyring) { @@ -761,18 +760,22 @@ keepass.checkForNewKeePassXCVersion = function() { }; keepass.connectToNative = function() { - if (!keepass.isConnected) { + /*if (!keepass.isConnected) { keepass.nativeConnect(); + }*/ + if (keepass.nativePort) { + keepass.nativePort.disconnect(); } + keepass.nativeConnect(); }; keepass.onNativeMessage = function(response) { - console.log('Received message: ' + JSON.stringify(response)); + //console.log('Received message: ' + JSON.stringify(response)); // Handle database lock/unlock status if (response.action === kpActions.DATABASE_LOCKED || response.action === kpActions.DATABASE_UNLOCKED) { keepass.testAssociation((response) => { - keepass.isConfigured((configured) => { + keepass.isConfigured().then((configured) => { let data = page.tabs[page.currentTabId].stack[page.tabs[page.currentTabId].stack.length - 1]; data.iconType = configured ? 'normal' : 'cross'; browserAction.show(null, {'id': page.currentTabId}); From b94e0f33e79f7b0505547f7381ad15de7be2b2f3 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 30 Oct 2017 13:48:45 +0200 Subject: [PATCH 05/24] Database locking fixes --- keepassxc-browser/background/event.js | 6 +- keepassxc-browser/background/init.js | 2 +- keepassxc-browser/background/keepass.js | 133 ++++++++++++------------ 3 files changed, 72 insertions(+), 69 deletions(-) diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index caf36e3..666ad07 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -142,7 +142,7 @@ kpxcEvent.onReconnect = function(callback, tab) { // Add a small timeout after reconnecting. Just to make sure. It's not pretty, I know :( setTimeout(() => { keepass.generateNewKeyPair(); - keepass.changePublicKeys(tab, (pkRes) => { + keepass.changePublicKeys(tab).then((pkRes) => { keepass.getDatabaseHash((gdRes) => { if (gdRes) { keepass.testAssociation((response) => { @@ -157,9 +157,9 @@ kpxcEvent.onReconnect = function(callback, tab) { }; kpxcEvent.lockDatabase = function(callback, tab) { - keepass.lockDatabase((response) => { + keepass.lockDatabase(tab).then((response => { kpxcEvent.showStatus(true, tab, callback); - }, tab); + })); }; kpxcEvent.onPopStack = function(callback, tab) { diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js index fa369a9..127f4d6 100644 --- a/keepassxc-browser/background/init.js +++ b/keepassxc-browser/background/init.js @@ -3,7 +3,7 @@ keepass.migrateKeyRing().then(() => { page.initOpenedTabs().then(() => { keepass.connectToNative(); keepass.generateNewKeyPair(); - keepass.changePublicKeys(null, (pkRes) => { + keepass.changePublicKeys(null, keepass.messageTimeout).then((pkRes) => { keepass.getDatabaseHash((gdRes) => {}, null); }); }); diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 78cfe98..568245f 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -473,7 +473,7 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { } if (!keepass.serverPublicKey) { - keepass.changePublicKeys(tab, null); + keepass.changePublicKeys(tab); } const kpAction = kpActions.GET_DATABASE_HASH; @@ -529,8 +529,8 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { else { keepass.databaseHash = 'no-hash'; keepass.isDatabaseClosed = true; - keepass.isKeePassXCAvailable = false; - if (response.message === "") { + if (response.message === '') { + keepass.isKeePassXCAvailable = false; keepass.handleError(tab, kpErrors.TIMEOUT_OR_NOT_CONNECTED); } else { @@ -541,83 +541,86 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { }); }; -keepass.changePublicKeys = function(tab, callback) { - if (!keepass.isConnected) { - callback([]); - return; - } +keepass.changePublicKeys = function(tab, enableTimeout = false) { + return new Promise((resolve, reject) => { + if (!keepass.isConnected) { + reject(false); + } - const kpAction = kpActions.CHANGE_PUBLIC_KEYS; - const key = keepass.b64e(keepass.keyPair.publicKey); - let nonce = nacl.randomBytes(keepass.keySize); - nonce = keepass.b64e(nonce); - keepass.clientID = keepass.b64e(nacl.randomBytes(keepass.keySize)); + const kpAction = kpActions.CHANGE_PUBLIC_KEYS; + const key = keepass.b64e(keepass.keyPair.publicKey); + let nonce = nacl.randomBytes(keepass.keySize); + nonce = keepass.b64e(nonce); + keepass.clientID = keepass.b64e(nacl.randomBytes(keepass.keySize)); - const request = { - action: kpAction, - publicKey: key, - proxyPort: (page.settings.port ? page.settings.port : 19700), - nonce: nonce, - clientID: keepass.clientID - }; + const request = { + action: kpAction, + publicKey: key, + proxyPort: (page.settings.port ? page.settings.port : 19700), + nonce: nonce, + clientID: keepass.clientID + }; - keepass.sendNativeMessage(request).then((response) => { - keepass.setcurrentKeePassXCVersion(response.version); + keepass.sendNativeMessage(request, enableTimeout).then((response) => { + keepass.setcurrentKeePassXCVersion(response.version); - if (!keepass.verifyKeyResponse(response, key, nonce)) { - if (tab && page.tabs[tab.id]) { - keepass.handleError(tab, kpErrors.KEY_CHANGE_FAILED); - callback(false); + if (!keepass.verifyKeyResponse(response, key, nonce)) { + if (tab && page.tabs[tab.id]) { + keepass.handleError(tab, kpErrors.KEY_CHANGE_FAILED); + reject(false); + } } - } - else { - keepass.isKeePassXCAvailable = true; - console.log('Server public key: ' + keepass.b64e(keepass.serverPublicKey)); - } - callback(true); + else { + keepass.isKeePassXCAvailable = true; + console.log('Server public key: ' + keepass.b64e(keepass.serverPublicKey)); + } + resolve(true); + }); }); }; -keepass.lockDatabase = function(callback, tab, forceCallback) { - if (!keepass.isConnected) { - keepass.handleError(tab, kpErrors.TIMEOUT_OR_NOT_CONNECTED); - callback([]); - return; - } +keepass.lockDatabase = function(tab) { + return new Promise((resolve, reject) => { + if (!keepass.isConnected) { + keepass.handleError(tab, kpErrors.TIMEOUT_OR_NOT_CONNECTED); + reject(false); + } - const kpAction = kpActions.LOCK_DATABASE; - const nonce = nacl.randomBytes(keepass.keySize); + const kpAction = kpActions.LOCK_DATABASE; + const nonce = nacl.randomBytes(keepass.keySize); - const messageData = { - action: kpAction - }; + const messageData = { + action: kpAction + }; - const request = { - action: kpAction, - message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), - clientID: keepass.clientID - }; + const request = { + action: kpAction, + message: keepass.encrypt(messageData, nonce), + nonce: keepass.b64e(nonce), + clientID: keepass.clientID + }; - keepass.sendNativeMessage(request).then((response) => { - if (response.message && response.nonce) { - const res = keepass.decrypt(response.message, response.nonce); - if (res) { - const message = nacl.util.encodeUTF8(res); - const parsed = JSON.parse(message); - keepass.setcurrentKeePassXCVersion(parsed.version); + keepass.sendNativeMessage(request).then((response) => { + if (response.message && response.nonce) { + const res = keepass.decrypt(response.message, response.nonce); + if (res) { + const message = nacl.util.encodeUTF8(res); + const parsed = JSON.parse(message); + keepass.setcurrentKeePassXCVersion(parsed.version); - if (keepass.verifyResponse(parsed, response.nonce)) { - keepass.isDatabaseClosed = true; - keepass.handleError(tab, kpErrors.DATABASE_NOT_OPENED); - callback(false); + if (keepass.verifyResponse(parsed, response.nonce)) { + keepass.isDatabaseClosed = true; + keepass.handleError(tab, kpErrors.DATABASE_NOT_OPENED); + resolve(false); + } } } - } - else if (response.error && response.errorCode) { - keepass.handleError(tab, response.errorCode, response.error); - } - callback(false); + else if (response.error && response.errorCode) { + keepass.isDatabaseClosed = true; + keepass.handleError(tab, response.errorCode, response.error); + } + resolve(false); + }); }); }; From 192e64746520e694e81ed3754fe5cfce1feea195 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 30 Oct 2017 14:43:24 +0200 Subject: [PATCH 06/24] Small fixes --- keepassxc-browser/background/keepass.js | 85 ++++++++++++------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 568245f..d5294bf 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -83,6 +83,48 @@ browser.storage.local.get({ keepass.keyRing = item.keyRing; }); +keepass.sendNativeMessage = function(request, enableTimeout = false) { + return new Promise((resolve, reject) => { + let timeout; + let action = request.action; + let ev = keepass.nativePort.onMessage; + + let listener = ((port, action) => { + let handler = (msg) => { + if (msg && msg.action === action) { + port.removeListener(handler); + if (enableTimeout) { + clearTimeout(timeout); + } + resolve(msg); + } + }; + return handler; + })(ev, action); + ev.addListener(listener); + + + // Handle timeouts + if (enableTimeout) { + timeout = setTimeout(() => { + const errorMessage = { + action: action, + error: kpErrors.getError(kpErrors.TIMEOUT_OR_NOT_CONNECTED), + errorCode: kpErrors.TIMEOUT_OR_NOT_CONNECTED + }; + keepass.isKeePassXCAvailable = false; + ev.removeListener(listener.handler); + resolve(errorMessage); + }, keepass.messageTimeout); + } + + // Send the request + if (keepass.nativePort) { + keepass.nativePort.postMessage(request); + } + }); +}; + keepass.addCredentials = function(callback, tab, username, password, url) { keepass.updateCredentials(callback, tab, null, username, password, url); }; @@ -217,46 +259,6 @@ keepass.retrieveCredentials = function(callback, tab, url, submiturl, forceCallb }, tab); }; -keepass.sendNativeMessage = function(request, enableTimeout = false) { - return new Promise((resolve, reject) => { - let timeout; - let action = request.action; - let ev = keepass.nativePort.onMessage; - - let listener = ((port, action) => { - let handler = (msg) => { - if (msg && msg.action === action) { - port.removeListener(handler); - if (enableTimeout) { - clearTimeout(timeout); - } - resolve(msg); - } - }; - return handler; - })(ev, action); - ev.addListener(listener); - - - // Handle timeouts - if (enableTimeout) { - timeout = setTimeout(() => { - const errorMessage = { - action: action, - error: kpErrors.getError(kpErrors.TIMEOUT_OR_NOT_CONNECTED), - errorCode: kpErrors.TIMEOUT_OR_NOT_CONNECTED - }; - keepass.isKeePassXCAvailable = false; - ev.removeListener(listener.handler); - resolve(errorMessage); - }, keepass.messageTimeout); - } - - // Send the request - keepass.nativePort.postMessage(request); - }); -}; - keepass.generatePassword = function(callback, tab, forceCallback) { if (!keepass.isConnected) { callback([]); @@ -763,9 +765,6 @@ keepass.checkForNewKeePassXCVersion = function() { }; keepass.connectToNative = function() { - /*if (!keepass.isConnected) { - keepass.nativeConnect(); - }*/ if (keepass.nativePort) { keepass.nativePort.disconnect(); } From 08b8b0e252ab063c621a6d11048d3673c49af2b1 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Tue, 31 Oct 2017 19:05:36 +0200 Subject: [PATCH 07/24] More minor fixes --- CHANGELOG | 5 +++++ keepassxc-browser/background/event.js | 4 ++-- keepassxc-browser/background/keepass.js | 5 ++--- keepassxc-browser/manifest.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fa98f6f..c5d27b6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +0.3.8 (??-??-2017) +========================= +- Use browser.local.storage instead of localStorage +- Switched some functions to promise + 0.3.7 (22-10-2017) ========================= - Improved credentials check (does not use protocol requests for polling) diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index 666ad07..bf9b5d2 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -181,9 +181,9 @@ kpxcEvent.onGetConnectedDatabase = function(callback, tab) { kpxcEvent.onGetKeePassXCVersions = function(callback, tab) { if(keepass.currentKeePassXC.version == 0) { - keepass.getDatabaseHash(tab).then(() => { + keepass.getDatabaseHash((res) => { callback({"current": keepass.currentKeePassXC.version, "latest": keepass.currentKeePassXC.version}); - }); + }, tab); } else { callback({"current": keepass.currentKeePassXC.version, "latest": keepass.currentKeePassXC.version}); } diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index d5294bf..0134883 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -18,7 +18,6 @@ keepass.keySize = 24; keepass.latestVersionUrl = 'https://api.github.com/repos/keepassxreboot/keepassxc/releases/latest'; keepass.cacheTimeout = 30 * 1000; // milliseconds keepass.databaseHash = 'no-hash'; //no-hash = KeePassXC is too old and does not return a hash value -keepass.keyRing = (typeof(localStorage.keyRing) === 'undefined') ? {} : JSON.parse(localStorage.keyRing); keepass.keyId = 'keepassxc-browser-cryptokey-name'; keepass.keyBody = 'keepassxc-browser-key'; keepass.messageTimeout = 500; // milliseconds @@ -633,8 +632,8 @@ keepass.generateNewKeyPair = function() { keepass.isConfigured = function() { return new Promise((resolve, reject) => { - if (typeof(keepass.databaseHash) === 'undefined') { - keepass.getDatabaseHash().then((hash) => { + if (typeof(keepass.databaseHash) === 'undefined' || keepass.databaseHash === 'no-hash') { + keepass.getDatabaseHash((hash) => { resolve(hash in keepass.keyRing); }); } else { diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index 9d8273b..0ae891e 100644 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "keepassxc-browser", - "version": "0.3.7", + "version": "0.3.8", "description": "KeePassXC integration for modern web browsers", "author": "Sami Vänttinen", "icons": { From 86abb7aa02747285e59297568e76013e27d2f873 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 1 Nov 2017 19:04:04 +0200 Subject: [PATCH 08/24] Changelog --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c5d27b6..4f7f90a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.3.8 (??-??-2017) +0.3.8 (01-11-2017) ========================= - Use browser.local.storage instead of localStorage - Switched some functions to promise From f83cc79e739d1b5344b90f9159465268f71fd1c8 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sat, 4 Nov 2017 10:27:18 +0200 Subject: [PATCH 09/24] Removed incorrect timeout waiting on init --- CHANGELOG | 6 +++++- keepassxc-browser/background/event.js | 5 +++++ keepassxc-browser/background/init.js | 2 +- keepassxc-browser/background/page.js | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4f7f90a..6b1927b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ +0.3.9 (04-11-2017) +========================= +- Removed incorrect timeout waiting on init + 0.3.8 (01-11-2017) ========================= -- Use browser.local.storage instead of localStorage +- Use browser.storage.local instead of localStorage - Switched some functions to promise 0.3.7 (22-10-2017) diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index bf9b5d2..264a70a 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -130,6 +130,11 @@ kpxcEvent.onSaveSettings = function(callback, tab, settings) { kpxcEvent.onGetStatus = function(callback, tab) { keepass.testAssociation((response) => { + if (!response) { + kpxcEvent.showStatus(false, tab, callback); + return; + } + keepass.isConfigured().then((configured) => { kpxcEvent.showStatus(configured, tab, callback); }); diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js index 127f4d6..a57cad3 100644 --- a/keepassxc-browser/background/init.js +++ b/keepassxc-browser/background/init.js @@ -3,7 +3,7 @@ keepass.migrateKeyRing().then(() => { page.initOpenedTabs().then(() => { keepass.connectToNative(); keepass.generateNewKeyPair(); - keepass.changePublicKeys(null, keepass.messageTimeout).then((pkRes) => { + keepass.changePublicKeys(null).then((pkRes) => { keepass.getDatabaseHash((gdRes) => {}, null); }); }); diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js index 8e868d3..7aba064 100644 --- a/keepassxc-browser/background/page.js +++ b/keepassxc-browser/background/page.js @@ -54,6 +54,7 @@ page.initOpenedTabs = function() { // set initial tab-ID browser.tabs.query({ "active": true, "currentWindow": true }).then((tabs) => { if (tabs.length === 0) { + resolve(); return; // For example: only the background devtools or a popup are opened } page.currentTabId = tabs[0].id; From 07c3c7e6b031952227e068812395aca9136925ba Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sat, 4 Nov 2017 10:30:56 +0200 Subject: [PATCH 10/24] Updated manifest --- keepassxc-browser/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index 0ae891e..98bec40 100644 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "keepassxc-browser", - "version": "0.3.8", + "version": "0.3.9", "description": "KeePassXC integration for modern web browsers", "author": "Sami Vänttinen", "icons": { From d91ccf3914b6b16fa8f16588d6556e0aec9bfa84 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 5 Nov 2017 14:07:30 +0200 Subject: [PATCH 11/24] Updated wiki link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3e6922..8f72920 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Get the extension for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/k 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. +Please thee this [wiki page](hhttps://github.com/varjolintu/keepassxc-browser/wiki/Connecting-the-database-with-keepassxc-browser) 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: @@ -18,7 +18,7 @@ There are two methods which you can use keepassxc-browser to connect to KeePassX This can cause unsaved changes not to be saved. If you use this method it's important to enable `Automatically save after every change` from KeePassXC's preferences. 2. keepassxc-browser communicated with KeePassXC through [keepassxc-proxy](https://github.com/varjolintu/keepassxc-proxy) or [keepassxc-proxy-rust](https://github.com/varjolintu/keepassxc-proxy-rust). The proxy handles listening stdin/stdout -and transfers these messages through a localhost UDP port 19700 (configurable) to KeePassXC. This means KeePassXC can be used and started normally without inteference from +and transfers these messages through Unix domain sockets / named pipes to KeePassXC. This means KeePassXC can be used and started normally without inteference from Native Messaging API. keepassxc-browser starts only the proxy application and there's no risk of shutting down KeePassXC or losing any unsaved changes. keepassxc-proxy is still under development. If you want, you are free to write your own proxy that handles the traffic. From 4b0420d27d693e7ec00cba6f84b78d1b760795cd Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 8 Nov 2017 12:28:44 +0200 Subject: [PATCH 12/24] Fixed XML display error, context menu on password fields with Firefox, changed fill-password keyboard shortcuts --- keepassxc-browser/background/init.js | 16 +++++++++++----- keepassxc-browser/manifest.json | 9 ++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js index a57cad3..4d58c68 100644 --- a/keepassxc-browser/background/init.js +++ b/keepassxc-browser/background/init.js @@ -92,17 +92,23 @@ if (browser.webRequest.onAuthRequired) { browser.runtime.onMessage.addListener(kpxcEvent.onMessage); const contextMenuItems = [ - {title: 'Fill &User + Pass', action: 'fill_user_pass'}, - {title: 'Fill &Pass Only', action: 'fill_pass_only'}, - {title: 'Show Password &Generator Icons', action: 'activate_password_generator'}, - {title: '&Save credentials', action: 'remember_credentials'} + {title: 'Fill User + Pass', action: 'fill_user_pass'}, + {title: 'Fill Pass Only', action: 'fill_pass_only'}, + {title: 'Show Password Generator Icons', action: 'activate_password_generator'}, + {title: 'Save credentials', action: 'remember_credentials'} ]; +let menuContexts = ['editable']; + +if (isFirefox()) { + menuContexts.push('password'); +} + // Create context menu items for (const item of contextMenuItems) { browser.contextMenus.create({ title: item.title, - contexts: [ 'editable' ], + contexts: menuContexts, onclick: (info, tab) => { browser.tabs.sendMessage(tab.id, { action: item.action diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index 98bec40..9ca67fd 100644 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "keepassxc-browser", - "version": "0.3.9", + "version": "0.4.0", "description": "KeePassXC integration for modern web browsers", "author": "Sami Vänttinen", "icons": { @@ -41,6 +41,9 @@ "matches": [ "" ], + "exclude_matches": [ + "*://*/*.xml" + ], "js": [ "browser-polyfill.min.js", "global.js", @@ -67,8 +70,8 @@ "fill-password": { "description": "Insert a password", "suggested_key": { - "default": "Ctrl+Shift+P", - "mac": "Command+Shift+P" + "default": "Alt+Shift+P", + "mac": "Alt+Shift+P" } } }, From 74031b6bec3d0f5a6300d4933b22d49ff239a890 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Thu, 9 Nov 2017 13:25:42 +0200 Subject: [PATCH 13/24] Removed UDP settings --- keepassxc-browser/background/keepass.js | 49 +++++++++++-------------- keepassxc-browser/background/page.js | 6 +-- keepassxc-browser/options/options.html | 18 --------- keepassxc-browser/options/options.js | 14 ------- keepassxc-protocol.md | 3 +- 5 files changed, 23 insertions(+), 67 deletions(-) diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 0134883..a7252a8 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -160,7 +160,7 @@ keepass.updateCredentials = function(callback, tab, entryId, username, password, const request = { action: kpAction, message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -221,7 +221,7 @@ keepass.retrieveCredentials = function(callback, tab, url, submiturl, forceCallb const request = { action: kpAction, message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -285,7 +285,7 @@ keepass.generatePassword = function(callback, tab, forceCallback) { const request = { action: kpAction, - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -334,7 +334,7 @@ keepass.associate = function(callback, tab) { page.tabs[tab.id].errorMessage = null; const kpAction = kpActions.ASSOCIATE; - const key = keepass.b64e(keepass.keyPair.publicKey); + const key = nacl.util.encodeBase64(keepass.keyPair.publicKey); const nonce = nacl.randomBytes(keepass.keySize); const messageData = { @@ -345,7 +345,7 @@ keepass.associate = function(callback, tab) { const request = { action: kpAction, message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -427,7 +427,7 @@ keepass.testAssociation = function(callback, tab, enableTimeout = false) { const request = { action: kpAction, message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -494,7 +494,7 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { const request = { action: kpAction, message: encrypted, - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -549,15 +549,14 @@ keepass.changePublicKeys = function(tab, enableTimeout = false) { } const kpAction = kpActions.CHANGE_PUBLIC_KEYS; - const key = keepass.b64e(keepass.keyPair.publicKey); + const key = nacl.util.encodeBase64(keepass.keyPair.publicKey); let nonce = nacl.randomBytes(keepass.keySize); - nonce = keepass.b64e(nonce); - keepass.clientID = keepass.b64e(nacl.randomBytes(keepass.keySize)); + nonce = nacl.util.encodeBase64(nonce); + keepass.clientID = nacl.util.encodeBase64(nacl.randomBytes(keepass.keySize)); const request = { action: kpAction, publicKey: key, - proxyPort: (page.settings.port ? page.settings.port : 19700), nonce: nonce, clientID: keepass.clientID }; @@ -573,7 +572,7 @@ keepass.changePublicKeys = function(tab, enableTimeout = false) { } else { keepass.isKeePassXCAvailable = true; - console.log('Server public key: ' + keepass.b64e(keepass.serverPublicKey)); + console.log('Server public key: ' + nacl.util.encodeBase64(keepass.serverPublicKey)); } resolve(true); }); @@ -597,7 +596,7 @@ keepass.lockDatabase = function(tab) { const request = { action: kpAction, message: keepass.encrypt(messageData, nonce), - nonce: keepass.b64e(nonce), + nonce: nacl.util.encodeBase64(nonce), clientID: keepass.clientID }; @@ -627,7 +626,7 @@ keepass.lockDatabase = function(tab) { keepass.generateNewKeyPair = function() { keepass.keyPair = nacl.box.keyPair(); - //console.log(keepass.b64e(keepass.keyPair.publicKey) + ' ' + keepass.b64e(keepass.keyPair.secretKey)); + //console.log(nacl.util.encodeBase64(keepass.keyPair.publicKey) + ' ' + nacl.util.encodeBase64(keepass.keyPair.secretKey)); }; keepass.isConfigured = function() { @@ -810,13 +809,14 @@ keepass.verifyKeyResponse = function(response, key, nonce) { } let reply = false; - if (keepass.b64d(nonce).length !== nacl.secretbox.nonceLength) + if (nacl.util.decodeBase64(nonce).length !== nacl.secretbox.nonceLength) { return false; + } reply = (response.nonce === nonce); if (response.publicKey) { - keepass.serverPublicKey = keepass.b64d(response.publicKey); + keepass.serverPublicKey = nacl.util.decodeBase64(response.publicKey); reply = true; } @@ -832,8 +832,9 @@ keepass.verifyResponse = function(response, nonce, id) { keepass.associated.hash = keepass.databaseHash; - if (keepass.b64d(response.nonce).length !== nacl.secretbox.nonceLength) + if (nacl.util.decodeBase64(response.nonce).length !== nacl.secretbox.nonceLength) { return false; + } keepass.associated.value = (response.nonce === nonce); @@ -856,14 +857,6 @@ keepass.handleError = function(tab, errorCode, errorMessage = '') { } }; -keepass.b64e = function(d) { - return nacl.util.encodeBase64(d); -}; - -keepass.b64d = function(d) { - return nacl.util.decodeBase64(d); -}; - keepass.getCryptoKey = function() { let dbkey = null; let dbid = null; @@ -890,15 +883,15 @@ keepass.encrypt = function(input, nonce) { if (keepass.serverPublicKey) { const message = nacl.box(messageData, nonce, keepass.serverPublicKey, keepass.keyPair.secretKey); if (message) { - return keepass.b64e(message); + return nacl.util.encodeBase64(message); } } return ''; }; keepass.decrypt = function(input, nonce, toStr) { - const m = keepass.b64d(input); - const n = keepass.b64d(nonce); + const m = nacl.util.decodeBase64(input); + const n = nacl.util.decodeBase64(nonce); const res = nacl.box.open(m, n, keepass.serverPublicKey, keepass.keyPair.secretKey); return res; }; diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js index 7aba064..5b9c525 100644 --- a/keepassxc-browser/background/page.js +++ b/keepassxc-browser/background/page.js @@ -4,8 +4,7 @@ const defaultSettings = { autoFillAndSend: true, usePasswordGenerator: true, autoFillSingleEntry: false, - autoRetrieveCredentials: true, - proxyPort: '19700' + autoRetrieveCredentials: true }; var page = {}; @@ -35,9 +34,6 @@ page.initSettings = function() { if (!('autoRetrieveCredentials' in page.settings)) { page.settings.autoRetrieveCredentials = defaultSettings.autoRetrieveCredentials; } - if (!('port' in page.settings)) { - page.settings.port = defaultSettings.proxyPort; - } browser.storage.local.set({'settings': page.settings}); resolve(); }); diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html index 9da6052..1a24336 100644 --- a/keepassxc-browser/options/options.html +++ b/keepassxc-browser/options/options.html @@ -84,24 +84,6 @@

-

-

- -
-
- - -
- - Change the port if you have trouble with running KeePassXC on the default port. -
- You have to set the same port number in KeePassXC options. -
- Default: 19700 - -
-
-

diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index 6328a29..47b29d4 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -88,24 +88,10 @@ options.initGeneralSettings = function() { }).then(options.showKeePassXCVersions); }); - $('#port').val(options.settings['port']); $('#blinkTimeout').val(options.settings['blinkTimeout']); $('#blinkMinTimeout').val(options.settings['blinkMinTimeout']); $('#allowedRedirect').val(options.settings['allowedRedirect']); - $('#portButton').click(function() { - const port = $.trim($('#port').val()); - const portNumber = Number(port); - if (isNaN(port) || portNumber < 1025 || portNumber > 99999) { - $('#port').closest('.control-group').addClass('error'); - alert('The port number has to be in range 1025 - 99999.\nNothing saved!'); - return; - } - - options.settings['port'] = String(portNumber); - options.saveSetting('port'); - }); - $('#blinkTimeoutButton').click(function(){ const blinkTimeout = $.trim($('#blinkTimeout').val()); const blinkTimeoutval = Number(blinkTimeout); diff --git a/keepassxc-protocol.md b/keepassxc-protocol.md index 872bd08..703d627 100644 --- a/keepassxc-protocol.md +++ b/keepassxc-protocol.md @@ -34,7 +34,6 @@ Request: { "action": "change-public-keys", "publicKey": "", - "proxyPort": "", "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q", "clientID": "" } @@ -250,4 +249,4 @@ Response message data (success always returns an error, decrypted): "error": "Database not opened", "nonce": "tZvLrBzkQ9GxXq9PvKJj4iAnfPT0VZ3Q" } -``` \ No newline at end of file +``` From d0244adefa054909f16bb9b2b3337a3c95887c87 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Fri, 10 Nov 2017 14:48:10 +0200 Subject: [PATCH 14/24] Removed some unnecessary polling --- keepassxc-browser/background/event.js | 21 +++++++++++++------- keepassxc-browser/background/keepass.js | 2 +- keepassxc-browser/keepassxc-browser.js | 26 ++++++++++--------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index 264a70a..275a360 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -128,17 +128,24 @@ kpxcEvent.onSaveSettings = function(callback, tab, settings) { }); }; -kpxcEvent.onGetStatus = function(callback, tab) { - keepass.testAssociation((response) => { - if (!response) { - kpxcEvent.showStatus(false, tab, callback); - return; - } +kpxcEvent.onGetStatus = function(callback, tab, internalPoll = false) { + // When internalPoll is true the event is triggered from content script in intervals -> don't poll KeePassXC + if (!internalPoll) { + keepass.testAssociation((response) => { + if (!response) { + kpxcEvent.showStatus(false, tab, callback); + return; + } + keepass.isConfigured().then((configured) => { + kpxcEvent.showStatus(configured, tab, callback); + }); + }, tab, true); + } else { keepass.isConfigured().then((configured) => { kpxcEvent.showStatus(configured, tab, callback); }); - }, tab, true); + } }; kpxcEvent.onReconnect = function(callback, tab) { diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index a7252a8..6f2244d 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -631,7 +631,7 @@ keepass.generateNewKeyPair = function() { keepass.isConfigured = function() { return new Promise((resolve, reject) => { - if (typeof(keepass.databaseHash) === 'undefined' || keepass.databaseHash === 'no-hash') { + if (typeof(keepass.databaseHash) === 'undefined') { keepass.getDatabaseHash((hash) => { resolve(hash in keepass.keyRing); }); diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index 41962ac..1b4b5ca 100644 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -396,7 +396,6 @@ cipPassword.callbackPasswordCopied = function(bool) { cipPassword.callbackGeneratedPassword = function(entries) { if (entries && entries.length >= 1) { - console.log(entries[0]); jQuery('#cip-genpw-btn-clipboard:first').removeClass('btn-success'); jQuery('input#cip-genpw-textfield-password:first').val(entries[0].password); if (isNaN(entries[0].login)) { @@ -408,7 +407,7 @@ cipPassword.callbackGeneratedPassword = function(entries) { } else { if (jQuery('div#cip-genpw-error:first').length === 0) { - jQuery('button#cip-genpw-btn-generate:first').after('
Cannot receive generated password.
Is your version of KeePassXC up-to-date?

Please visit the KeePassXC homepage
'); + jQuery('button#cip-genpw-btn-generate:first').after('
Cannot receive generated password.
Is KeePassXC opened?
'); jQuery('input#cip-genpw-textfield-password:first').parent().hide(); jQuery('input#cip-genpw-checkbox-next-field:first').parent('label').hide(); jQuery('button#cip-genpw-btn-generate').hide(); @@ -1117,21 +1116,15 @@ cip.init = function() { }; cip.detectNewActiveFields = function() { - const hiddenFields = cipFields.getHiddenFieldCount(); - - // If hidden fields aren't detected, setInterval is being looped in each frame of the page - //if (hiddenFields > 0) { - const divDetect = setInterval(function() { - const fields = cipFields.getAllFields(); - if (fields.length > 1) { - cip.initCredentialFields(true); - clearInterval(divDetect); - } - }, 1000); - //} + const divDetect = setInterval(function() { + const fields = cipFields.getAllFields(); + if (fields.length > 1) { + cip.initCredentialFields(true); + clearInterval(divDetect); + } + }, 1000); }; -// Try to do this in a way that database value if checked without polling the KeePassXC.. too many messages jumping around // Switch credentials if database is changed or closed cip.detectDatabaseChange = function() { let dbDetectInterval = setInterval(function() { @@ -1148,7 +1141,8 @@ cip.detectDatabaseChange = function() { // Switch back to default popup browser.runtime.sendMessage({ - action: 'get_status' + action: 'get_status', + args: [ true ] // Set polling to true, this is an internal function call }); } else { if (response.new !== 'no-hash' && response.new !== response.old) { From d8556fc958bc3d497e06199bb0e6ef1c03e4081e Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 13 Nov 2017 15:45:06 +0200 Subject: [PATCH 15/24] Updated the README. Added an error handling --- CHANGELOG | 6 ++++++ README.md | 13 +++++++------ keepassxc-browser/background/keepass.js | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6b1927b..c21b0b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +0.4.0 (13-11-2017) +========================= +- Fixed showing context menu on password fields with Firefox +- Ignore XML files on content scripts (Firefox shows them incorrectly) +- UDP features removed as KeePassXC switched them to Unix domain sockets and named pipes + 0.3.9 (04-11-2017) ========================= - Removed incorrect timeout waiting on init diff --git a/README.md b/README.md index 8f72920..04a9c7b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # keepassxc-browser -Chrome extension for [KeePassXC](https://keepassxc.org/) with Native Messaging. +Browser extension for [KeePassXC](https://keepassxc.org/) with Native Messaging. This is a heavily forked version of [pfn](https://github.com/pfn)'s [chromeIPass](https://github.com/pfn/passifox). Some changes merged also from [smorks'](https://github.com/smorks/keepasshttp-connector) KeePassHttp-Connector fork. -For testing purposes, please use following unofficial KeePassXC [release's](https://github.com/varjolintu/keepassxc/releases). +For testing purposes, please use only the following unofficial KeePassXC [release's](https://github.com/varjolintu/keepassxc/releases). 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 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. +The extension is supported with Firefox 55 and newer. If you want to load it as a temporary plugin with Firefox 54 or ESR you can just change the minimum version from the manifest file before loading it. Please thee this [wiki page](hhttps://github.com/varjolintu/keepassxc-browser/wiki/Connecting-the-database-with-keepassxc-browser) for instructions how to configure this KeePassXC fork in order to connect the database correctly. @@ -17,10 +17,11 @@ There are two methods which you can use keepassxc-browser to connect to KeePassX 1. keepassxc-browser communicates directly with KeePassXC via stdin/stdout. This method launches KeePassXC every time you start the browser and closes when you exit. This can cause unsaved changes not to be saved. If you use this method it's important to enable `Automatically save after every change` from KeePassXC's preferences. -2. keepassxc-browser communicated with KeePassXC through [keepassxc-proxy](https://github.com/varjolintu/keepassxc-proxy) or [keepassxc-proxy-rust](https://github.com/varjolintu/keepassxc-proxy-rust). The proxy handles listening stdin/stdout +2. keepassxc-browser communicated with KeePassXC through [keepassxc-proxy](https://github.com/varjolintu/keepassxc-proxy). The proxy handles listening stdin/stdout and transfers these messages through Unix domain sockets / named pipes to KeePassXC. This means KeePassXC can be used and started normally without inteference from Native Messaging API. keepassxc-browser starts only the proxy application and there's no risk of shutting down KeePassXC or losing any unsaved changes. keepassxc-proxy -is still under development. If you want, you are free to write your own proxy that handles the traffic. +is still under development. If you want, you are free to write your own proxy that handles the traffic. You don't need to install keepassxc-proxy separately. It is +included in the latest KeePassXC fork. Use it if you want to make your own proxy or improve/extend it. ## Improvements The following improvements and features have been made after the fork. At this point some features are only available with the KeePassXC fork: @@ -77,4 +78,4 @@ Feel free to support this project: - Donate via [PayPal](https://paypal.me/varjolintu) - Donate via Bitcoin: 1LHbD69CcmpLW5hjUXs2MGJhw3GxwqLdw3 -Also consider donating to [KeePassXC](https://flattr.com/submit/auto?fid=x7yqz0&url=https%3A%2F%2Fkeepassxc.org) and passifox teams [(1)](https://github.com/smorks/passifox),[(2)](https://github.com/projectgus/passifox),[(3)](https://github.com/pfn/passifox). They are doing great job. +Also consider donating to [KeePassXC](https://flattr.com/submit/auto?fid=x7yqz0&url=https%3A%2F%2Fkeepassxc.org) and passifox teams [(1)](https://github.com/smorks/passifox),[(2)](https://github.com/pfn/passifox). They are doing great job. diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 6f2244d..d457ba2 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -545,6 +545,7 @@ keepass.getDatabaseHash = function(callback, tab, enableTimeout = false) { keepass.changePublicKeys = function(tab, enableTimeout = false) { return new Promise((resolve, reject) => { if (!keepass.isConnected) { + keepass.handleError(tab, kpErrors.TIMEOUT_OR_NOT_CONNECTED); reject(false); } From a00a07ae26fb353eff75337541e955ad446280cc Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 15 Nov 2017 12:15:19 +0200 Subject: [PATCH 16/24] Added support for credential popups with only password fields visible --- keepassxc-browser/background/browserAction.js | 2 +- keepassxc-browser/background/event.js | 4 +-- keepassxc-browser/background/httpauth.js | 2 +- keepassxc-browser/background/init.js | 2 +- keepassxc-browser/background/keepass.js | 2 +- keepassxc-browser/keepassxc-browser.js | 32 ++++++++++++++----- keepassxc-browser/manifest.json | 2 +- 7 files changed, 31 insertions(+), 15 deletions(-) diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js index 34547a5..b2cdd80 100644 --- a/keepassxc-browser/background/browserAction.js +++ b/keepassxc-browser/background/browserAction.js @@ -1,4 +1,4 @@ -var browserAction = {}; +const browserAction = {}; const BLINK_TIMEOUT_DEFAULT = 7500; const BLINK_TIMEOUT_REDIRECT_THRESHOLD_TIME_DEFAULT = -1; diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js index 275a360..9b42ca3 100644 --- a/keepassxc-browser/background/event.js +++ b/keepassxc-browser/background/event.js @@ -1,4 +1,4 @@ -var kpxcEvent = {}; +const kpxcEvent = {}; kpxcEvent.onMessage = function(request, sender, callback) { if (request.action in kpxcEvent.messageHandlers) { @@ -124,7 +124,7 @@ kpxcEvent.onLoadKeyRing = function(callback, tab) { kpxcEvent.onSaveSettings = function(callback, tab, settings) { browser.storage.local.set({'settings': settings}).then(function() { - kpxcEvent.onLoadSettings(); + kpxcEvent.onLoadSettings(callback, tab); }); }; diff --git a/keepassxc-browser/background/httpauth.js b/keepassxc-browser/background/httpauth.js index f1ad0ba..35dc99e 100644 --- a/keepassxc-browser/background/httpauth.js +++ b/keepassxc-browser/background/httpauth.js @@ -1,4 +1,4 @@ -var httpAuth = httpAuth || {}; +const httpAuth = {}; httpAuth.requests = []; httpAuth.pendingCallbacks = []; diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js index 4d58c68..149328a 100644 --- a/keepassxc-browser/background/init.js +++ b/keepassxc-browser/background/init.js @@ -11,7 +11,7 @@ keepass.migrateKeyRing().then(() => { }); // Milliseconds for intervall (e.g. to update browserAction) -let _interval = 250; +const _interval = 250; /** diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index 6f2244d..c3cd936 100644 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -1,6 +1,6 @@ 'use strict'; -var keepass = {}; +const keepass = {}; keepass.associated = {'value': false, 'hash': null}; keepass.keyPair = {publicKey: null, secretKey: null}; diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index 1b4b5ca..db1ab30 100644 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -4,6 +4,9 @@ $(this.target).find('input').autocomplete(); // contains already called method names var _called = {}; +// Count of detected form fields on the page +var _detectedFields = 0; + browser.runtime.onMessage.addListener(function(req, sender, callback) { if ('action' in req) { if (req.action === 'fill_user_pass_with_specific_login') { @@ -806,6 +809,7 @@ cipFields.getAllFields = function() { } }); + _detectedFields = fields.length; return fields; }; @@ -1075,7 +1079,7 @@ cipFields.useDefinedCredentialFields = function() { } if ($found) { - var fields = { + let fields = { username: creds.username, password: creds.password, fields: creds.fields @@ -1111,16 +1115,20 @@ cip.init = function() { action: 'load_settings', }).then((response) => { cip.settings = response; - cip.initCredentialFields(); + cip.initCredentialFields(true); }); }; cip.detectNewActiveFields = function() { const divDetect = setInterval(function() { - const fields = cipFields.getAllFields(); - if (fields.length > 1) { - cip.initCredentialFields(true); - clearInterval(divDetect); + if (document.visibilityState !== 'hidden') { + const fields = cipFields.getAllFields(); + + // If only password field is shown it's enough to have one field visible for initCredentialFields + if (fields.length > (_detectedFields == 1 ? 0 : 1)) { + cip.initCredentialFields(true); + clearInterval(divDetect); + } } }, 1000); }; @@ -1290,8 +1298,16 @@ cip.preparePageForMultipleCredentials = function(credentials) { // initialize autocomplete for username fields if (cip.settings.autoCompleteUsernames) { for (const i of cipFields.combinations) { - if (_f(i.username)) { - cipAutocomplete.init(_f(i.username)); + // Both username and password fields are visible + if (_detectedFields >= 2) { + if (_f(i.username)) { + cipAutocomplete.init(_f(i.username)); + } + } else if (_detectedFields == 1) { + // If only password field is the visible one + if (_f(i.password)) { + cipAutocomplete.init(_f(i.password)); + } } } } diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index 9ca67fd..98a1b1a 100644 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "keepassxc-browser", - "version": "0.4.0", + "version": "0.4.1", "description": "KeePassXC integration for modern web browsers", "author": "Sami Vänttinen", "icons": { From 9e95778dec21cf8623322c4e5a46174352de9066 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Fri, 17 Nov 2017 08:20:38 +0200 Subject: [PATCH 17/24] Fixed jQuery UI overriding bug and non-necessary destroying the autocomplete menu --- keepassxc-browser/jquery-ui.min.css | 8 ++--- keepassxc-browser/jquery-ui.min.js | 20 +++++------ keepassxc-browser/keepassxc-browser.css | 46 ++++++++++++++++++------- keepassxc-browser/keepassxc-browser.js | 25 ++++++++++---- 4 files changed, 66 insertions(+), 33 deletions(-) diff --git a/keepassxc-browser/jquery-ui.min.css b/keepassxc-browser/jquery-ui.min.css index 776e259..ced6235 100644 --- a/keepassxc-browser/jquery-ui.min.css +++ b/keepassxc-browser/jquery-ui.min.css @@ -1,7 +1,7 @@ -/*! jQuery UI - v1.12.1 - 2016-09-14 +/*! jQuery UI - v1.12.1 - 2017-11-16 * http://jqueryui.com -* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6 +* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=.kpxc&folderName=kpxc&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&borderColorHighlight=dad55e&bgTextureHighlight=flat&bgColorHighlight=fffa90&iconColorActive=ffffff&fcActive=ffffff&borderColorActive=003eff&bgTextureActive=flat&bgColorActive=007fff&iconColorHover=555555&fcHover=2b2b2b&borderColorHover=cccccc&bgTextureHover=flat&bgColorHover=ededed&iconColorDefault=777777&fcDefault=454545&borderColorDefault=c5c5c5&bgTextureDefault=flat&bgColorDefault=f6f6f6&iconColorContent=444444&fcContent=333333&borderColorContent=dddddd&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=444444&fcHeader=333333&borderColorHeader=dddddd&bgTextureHeader=flat&bgColorHeader=e9e9e9&cornerRadius=3px&fwDefault=normal&fsDefault=1em&ffDefault=Arial%2CHelvetica%2Csans-serif * Copyright jQuery Foundation and other contributors; Licensed MIT */ -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.003;filter:Alpha(Opacity=.3)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666} \ No newline at end of file +.kpxc .ui-draggable-handle{-ms-touch-action:none;touch-action:none}.kpxc .ui-helper-hidden{display:none}.kpxc .ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.kpxc .ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.kpxc .ui-helper-clearfix:before,.kpxc .ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.kpxc .ui-helper-clearfix:after{clear:both}.kpxc .ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.kpxc .ui-front{z-index:100}.kpxc .ui-state-disabled{cursor:default!important;pointer-events:none}.kpxc .ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.kpxc .ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.kpxc .ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.kpxc .ui-resizable{position:relative}.kpxc .ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.kpxc .ui-resizable-disabled .ui-resizable-handle,.kpxc .ui-resizable-autohide .ui-resizable-handle{display:none}.kpxc .ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.kpxc .ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.kpxc .ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.kpxc .ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.kpxc .ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.kpxc .ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.kpxc .ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.kpxc .ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.kpxc .ui-selectable{-ms-touch-action:none;touch-action:none}.kpxc .ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.kpxc .ui-sortable-handle{-ms-touch-action:none;touch-action:none}.kpxc .ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.kpxc .ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.kpxc .ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.kpxc .ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.kpxc .ui-menu .ui-menu{position:absolute}.kpxc .ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.kpxc .ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.kpxc .ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.kpxc .ui-menu .ui-state-focus,.kpxc .ui-menu .ui-state-active{margin:-1px}.kpxc .ui-menu-icons{position:relative}.kpxc .ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.kpxc .ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.kpxc .ui-menu .ui-menu-icon{left:auto;right:0}.kpxc .ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.kpxc .ui-button,.kpxc .ui-button:link,.kpxc .ui-button:visited,.kpxc .ui-button:hover,.kpxc .ui-button:active{text-decoration:none}.kpxc .ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.kpxc .ui-button.ui-button-icon-only{text-indent:0}.kpxc .ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.kpxc .ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.kpxc .ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.kpxc .ui-button::-moz-focus-inner,button.kpxc .ui-button::-moz-focus-inner{border:0;padding:0}.kpxc .ui-controlgroup{vertical-align:middle;display:inline-block}.kpxc .ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.kpxc .ui-controlgroup > .ui-controlgroup-item:focus,.kpxc .ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.kpxc .ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.kpxc .ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.kpxc .ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.kpxc .ui-controlgroup .ui-controlgroup-label span{font-size:80%}.kpxc .ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.kpxc .ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.kpxc .ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.kpxc .ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.kpxc .ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.kpxc .ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.kpxc .ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.kpxc .ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.kpxc .ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.kpxc .ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.kpxc .ui-checkboxradio-disabled{pointer-events:none}.kpxc .ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.kpxc .ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.kpxc .ui-datepicker .ui-datepicker-prev,.kpxc .ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.kpxc .ui-datepicker .ui-datepicker-prev-hover,.kpxc .ui-datepicker .ui-datepicker-next-hover{top:1px}.kpxc .ui-datepicker .ui-datepicker-prev{left:2px}.kpxc .ui-datepicker .ui-datepicker-next{right:2px}.kpxc .ui-datepicker .ui-datepicker-prev-hover{left:1px}.kpxc .ui-datepicker .ui-datepicker-next-hover{right:1px}.kpxc .ui-datepicker .ui-datepicker-prev span,.kpxc .ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.kpxc .ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.kpxc .ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.kpxc .ui-datepicker select.ui-datepicker-month,.kpxc .ui-datepicker select.ui-datepicker-year{width:45%}.kpxc .ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.kpxc .ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.kpxc .ui-datepicker td{border:0;padding:1px}.kpxc .ui-datepicker td span,.kpxc .ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.kpxc .ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.kpxc .ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.kpxc .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.kpxc .ui-datepicker.ui-datepicker-multi{width:auto}.kpxc .ui-datepicker-multi .ui-datepicker-group{float:left}.kpxc .ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.kpxc .ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.kpxc .ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.kpxc .ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.kpxc .ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.kpxc .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.kpxc .ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.kpxc .ui-datepicker-row-break{clear:both;width:100%;font-size:0}.kpxc .ui-datepicker-rtl{direction:rtl}.kpxc .ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.kpxc .ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.kpxc .ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.kpxc .ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.kpxc .ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.kpxc .ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.kpxc .ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.kpxc .ui-datepicker-rtl .ui-datepicker-group{float:right}.kpxc .ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.kpxc .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.kpxc .ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.kpxc .ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.kpxc .ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.kpxc .ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.kpxc .ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.kpxc .ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.kpxc .ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.kpxc .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.kpxc .ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.kpxc .ui-dialog .ui-resizable-n{height:2px;top:0}.kpxc .ui-dialog .ui-resizable-e{width:2px;right:0}.kpxc .ui-dialog .ui-resizable-s{height:2px;bottom:0}.kpxc .ui-dialog .ui-resizable-w{width:2px;left:0}.kpxc .ui-dialog .ui-resizable-se,.kpxc .ui-dialog .ui-resizable-sw,.kpxc .ui-dialog .ui-resizable-ne,.kpxc .ui-dialog .ui-resizable-nw{width:7px;height:7px}.kpxc .ui-dialog .ui-resizable-se{right:0;bottom:0}.kpxc .ui-dialog .ui-resizable-sw{left:0;bottom:0}.kpxc .ui-dialog .ui-resizable-ne{right:0;top:0}.kpxc .ui-dialog .ui-resizable-nw{left:0;top:0}.kpxc .ui-draggable .ui-dialog-titlebar{cursor:move}.kpxc .ui-progressbar{height:2em;text-align:left;overflow:hidden}.kpxc .ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.kpxc .ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.kpxc .ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.kpxc .ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.kpxc .ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.kpxc .ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.kpxc .ui-selectmenu-open{display:block}.kpxc .ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.kpxc .ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.kpxc .ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.kpxc .ui-slider{position:relative;text-align:left}.kpxc .ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.kpxc .ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.kpxc .ui-slider.ui-state-disabled .ui-slider-handle,.kpxc .ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.kpxc .ui-slider-horizontal{height:.8em}.kpxc .ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.kpxc .ui-slider-horizontal .ui-slider-range{top:0;height:100%}.kpxc .ui-slider-horizontal .ui-slider-range-min{left:0}.kpxc .ui-slider-horizontal .ui-slider-range-max{right:0}.kpxc .ui-slider-vertical{width:.8em;height:100px}.kpxc .ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.kpxc .ui-slider-vertical .ui-slider-range{left:0;width:100%}.kpxc .ui-slider-vertical .ui-slider-range-min{bottom:0}.kpxc .ui-slider-vertical .ui-slider-range-max{top:0}.kpxc .ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.kpxc .ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.kpxc .ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.kpxc .ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.kpxc .ui-spinner-up{top:0}.kpxc .ui-spinner-down{bottom:0}.kpxc .ui-tabs{position:relative;padding:.2em}.kpxc .ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.kpxc .ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.kpxc .ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.kpxc .ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.kpxc .ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.kpxc .ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.kpxc .ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.kpxc .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.kpxc .ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.kpxc .ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .kpxc .ui-tooltip{border-width:2px}.kpxc .ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.kpxc .ui-widget .ui-widget{font-size:1em}.kpxc .ui-widget input,.kpxc .ui-widget select,.kpxc .ui-widget textarea,.kpxc .ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.kpxc .ui-widget.ui-widget-content{border:1px solid #c5c5c5}.kpxc .ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.kpxc .ui-widget-content a{color:#333}.kpxc .ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.kpxc .ui-widget-header a{color:#333}.kpxc .ui-state-default,.kpxc .ui-widget-content .ui-state-default,.kpxc .ui-widget-header .ui-state-default,.kpxc .ui-button,html .kpxc .ui-button.ui-state-disabled:hover,html .kpxc .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.kpxc .ui-state-default a,.kpxc .ui-state-default a:link,.kpxc .ui-state-default a:visited,a.kpxc .ui-button,a:link.kpxc .ui-button,a:visited.kpxc .ui-button,.kpxc .ui-button{color:#454545;text-decoration:none}.kpxc .ui-state-hover,.kpxc .ui-widget-content .ui-state-hover,.kpxc .ui-widget-header .ui-state-hover,.kpxc .ui-state-focus,.kpxc .ui-widget-content .ui-state-focus,.kpxc .ui-widget-header .ui-state-focus,.kpxc .ui-button:hover,.kpxc .ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.kpxc .ui-state-hover a,.kpxc .ui-state-hover a:hover,.kpxc .ui-state-hover a:link,.kpxc .ui-state-hover a:visited,.kpxc .ui-state-focus a,.kpxc .ui-state-focus a:hover,.kpxc .ui-state-focus a:link,.kpxc .ui-state-focus a:visited,a.kpxc .ui-button:hover,a.kpxc .ui-button:focus{color:#2b2b2b;text-decoration:none}.kpxc .ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.kpxc .ui-state-active,.kpxc .ui-widget-content .ui-state-active,.kpxc .ui-widget-header .ui-state-active,a.kpxc .ui-button:active,.kpxc .ui-button:active,.kpxc .ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.kpxc .ui-icon-background,.kpxc .ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.kpxc .ui-state-active a,.kpxc .ui-state-active a:link,.kpxc .ui-state-active a:visited{color:#fff;text-decoration:none}.kpxc .ui-state-highlight,.kpxc .ui-widget-content .ui-state-highlight,.kpxc .ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.kpxc .ui-state-checked{border:1px solid #dad55e;background:#fffa90}.kpxc .ui-state-highlight a,.kpxc .ui-widget-content .ui-state-highlight a,.kpxc .ui-widget-header .ui-state-highlight a{color:#777620}.kpxc .ui-state-error,.kpxc .ui-widget-content .ui-state-error,.kpxc .ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.kpxc .ui-state-error a,.kpxc .ui-widget-content .ui-state-error a,.kpxc .ui-widget-header .ui-state-error a{color:#5f3f3f}.kpxc .ui-state-error-text,.kpxc .ui-widget-content .ui-state-error-text,.kpxc .ui-widget-header .ui-state-error-text{color:#5f3f3f}.kpxc .ui-priority-primary,.kpxc .ui-widget-content .ui-priority-primary,.kpxc .ui-widget-header .ui-priority-primary{font-weight:bold}.kpxc .ui-priority-secondary,.kpxc .ui-widget-content .ui-priority-secondary,.kpxc .ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.kpxc .ui-state-disabled,.kpxc .ui-widget-content .ui-state-disabled,.kpxc .ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.kpxc .ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.kpxc .ui-icon{width:16px;height:16px}.kpxc .ui-icon,.kpxc .ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.kpxc .ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.kpxc .ui-state-hover .ui-icon,.kpxc .ui-state-focus .ui-icon,.kpxc .ui-button:hover .ui-icon,.kpxc .ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.kpxc .ui-state-active .ui-icon,.kpxc .ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.kpxc .ui-state-highlight .ui-icon,.kpxc .ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.kpxc .ui-state-error .ui-icon,.kpxc .ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.kpxc .ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.kpxc .ui-icon-blank{background-position:16px 16px}.kpxc .ui-icon-caret-1-n{background-position:0 0}.kpxc .ui-icon-caret-1-ne{background-position:-16px 0}.kpxc .ui-icon-caret-1-e{background-position:-32px 0}.kpxc .ui-icon-caret-1-se{background-position:-48px 0}.kpxc .ui-icon-caret-1-s{background-position:-65px 0}.kpxc .ui-icon-caret-1-sw{background-position:-80px 0}.kpxc .ui-icon-caret-1-w{background-position:-96px 0}.kpxc .ui-icon-caret-1-nw{background-position:-112px 0}.kpxc .ui-icon-caret-2-n-s{background-position:-128px 0}.kpxc .ui-icon-caret-2-e-w{background-position:-144px 0}.kpxc .ui-icon-triangle-1-n{background-position:0 -16px}.kpxc .ui-icon-triangle-1-ne{background-position:-16px -16px}.kpxc .ui-icon-triangle-1-e{background-position:-32px -16px}.kpxc .ui-icon-triangle-1-se{background-position:-48px -16px}.kpxc .ui-icon-triangle-1-s{background-position:-65px -16px}.kpxc .ui-icon-triangle-1-sw{background-position:-80px -16px}.kpxc .ui-icon-triangle-1-w{background-position:-96px -16px}.kpxc .ui-icon-triangle-1-nw{background-position:-112px -16px}.kpxc .ui-icon-triangle-2-n-s{background-position:-128px -16px}.kpxc .ui-icon-triangle-2-e-w{background-position:-144px -16px}.kpxc .ui-icon-arrow-1-n{background-position:0 -32px}.kpxc .ui-icon-arrow-1-ne{background-position:-16px -32px}.kpxc .ui-icon-arrow-1-e{background-position:-32px -32px}.kpxc .ui-icon-arrow-1-se{background-position:-48px -32px}.kpxc .ui-icon-arrow-1-s{background-position:-65px -32px}.kpxc .ui-icon-arrow-1-sw{background-position:-80px -32px}.kpxc .ui-icon-arrow-1-w{background-position:-96px -32px}.kpxc .ui-icon-arrow-1-nw{background-position:-112px -32px}.kpxc .ui-icon-arrow-2-n-s{background-position:-128px -32px}.kpxc .ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.kpxc .ui-icon-arrow-2-e-w{background-position:-160px -32px}.kpxc .ui-icon-arrow-2-se-nw{background-position:-176px -32px}.kpxc .ui-icon-arrowstop-1-n{background-position:-192px -32px}.kpxc .ui-icon-arrowstop-1-e{background-position:-208px -32px}.kpxc .ui-icon-arrowstop-1-s{background-position:-224px -32px}.kpxc .ui-icon-arrowstop-1-w{background-position:-240px -32px}.kpxc .ui-icon-arrowthick-1-n{background-position:1px -48px}.kpxc .ui-icon-arrowthick-1-ne{background-position:-16px -48px}.kpxc .ui-icon-arrowthick-1-e{background-position:-32px -48px}.kpxc .ui-icon-arrowthick-1-se{background-position:-48px -48px}.kpxc .ui-icon-arrowthick-1-s{background-position:-64px -48px}.kpxc .ui-icon-arrowthick-1-sw{background-position:-80px -48px}.kpxc .ui-icon-arrowthick-1-w{background-position:-96px -48px}.kpxc .ui-icon-arrowthick-1-nw{background-position:-112px -48px}.kpxc .ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.kpxc .ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.kpxc .ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.kpxc .ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.kpxc .ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.kpxc .ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.kpxc .ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.kpxc .ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.kpxc .ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.kpxc .ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.kpxc .ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.kpxc .ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.kpxc .ui-icon-arrowreturn-1-w{background-position:-64px -64px}.kpxc .ui-icon-arrowreturn-1-n{background-position:-80px -64px}.kpxc .ui-icon-arrowreturn-1-e{background-position:-96px -64px}.kpxc .ui-icon-arrowreturn-1-s{background-position:-112px -64px}.kpxc .ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.kpxc .ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.kpxc .ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.kpxc .ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.kpxc .ui-icon-arrow-4{background-position:0 -80px}.kpxc .ui-icon-arrow-4-diag{background-position:-16px -80px}.kpxc .ui-icon-extlink{background-position:-32px -80px}.kpxc .ui-icon-newwin{background-position:-48px -80px}.kpxc .ui-icon-refresh{background-position:-64px -80px}.kpxc .ui-icon-shuffle{background-position:-80px -80px}.kpxc .ui-icon-transfer-e-w{background-position:-96px -80px}.kpxc .ui-icon-transferthick-e-w{background-position:-112px -80px}.kpxc .ui-icon-folder-collapsed{background-position:0 -96px}.kpxc .ui-icon-folder-open{background-position:-16px -96px}.kpxc .ui-icon-document{background-position:-32px -96px}.kpxc .ui-icon-document-b{background-position:-48px -96px}.kpxc .ui-icon-note{background-position:-64px -96px}.kpxc .ui-icon-mail-closed{background-position:-80px -96px}.kpxc .ui-icon-mail-open{background-position:-96px -96px}.kpxc .ui-icon-suitcase{background-position:-112px -96px}.kpxc .ui-icon-comment{background-position:-128px -96px}.kpxc .ui-icon-person{background-position:-144px -96px}.kpxc .ui-icon-print{background-position:-160px -96px}.kpxc .ui-icon-trash{background-position:-176px -96px}.kpxc .ui-icon-locked{background-position:-192px -96px}.kpxc .ui-icon-unlocked{background-position:-208px -96px}.kpxc .ui-icon-bookmark{background-position:-224px -96px}.kpxc .ui-icon-tag{background-position:-240px -96px}.kpxc .ui-icon-home{background-position:0 -112px}.kpxc .ui-icon-flag{background-position:-16px -112px}.kpxc .ui-icon-calendar{background-position:-32px -112px}.kpxc .ui-icon-cart{background-position:-48px -112px}.kpxc .ui-icon-pencil{background-position:-64px -112px}.kpxc .ui-icon-clock{background-position:-80px -112px}.kpxc .ui-icon-disk{background-position:-96px -112px}.kpxc .ui-icon-calculator{background-position:-112px -112px}.kpxc .ui-icon-zoomin{background-position:-128px -112px}.kpxc .ui-icon-zoomout{background-position:-144px -112px}.kpxc .ui-icon-search{background-position:-160px -112px}.kpxc .ui-icon-wrench{background-position:-176px -112px}.kpxc .ui-icon-gear{background-position:-192px -112px}.kpxc .ui-icon-heart{background-position:-208px -112px}.kpxc .ui-icon-star{background-position:-224px -112px}.kpxc .ui-icon-link{background-position:-240px -112px}.kpxc .ui-icon-cancel{background-position:0 -128px}.kpxc .ui-icon-plus{background-position:-16px -128px}.kpxc .ui-icon-plusthick{background-position:-32px -128px}.kpxc .ui-icon-minus{background-position:-48px -128px}.kpxc .ui-icon-minusthick{background-position:-64px -128px}.kpxc .ui-icon-close{background-position:-80px -128px}.kpxc .ui-icon-closethick{background-position:-96px -128px}.kpxc .ui-icon-key{background-position:-112px -128px}.kpxc .ui-icon-lightbulb{background-position:-128px -128px}.kpxc .ui-icon-scissors{background-position:-144px -128px}.kpxc .ui-icon-clipboard{background-position:-160px -128px}.kpxc .ui-icon-copy{background-position:-176px -128px}.kpxc .ui-icon-contact{background-position:-192px -128px}.kpxc .ui-icon-image{background-position:-208px -128px}.kpxc .ui-icon-video{background-position:-224px -128px}.kpxc .ui-icon-script{background-position:-240px -128px}.kpxc .ui-icon-alert{background-position:0 -144px}.kpxc .ui-icon-info{background-position:-16px -144px}.kpxc .ui-icon-notice{background-position:-32px -144px}.kpxc .ui-icon-help{background-position:-48px -144px}.kpxc .ui-icon-check{background-position:-64px -144px}.kpxc .ui-icon-bullet{background-position:-80px -144px}.kpxc .ui-icon-radio-on{background-position:-96px -144px}.kpxc .ui-icon-radio-off{background-position:-112px -144px}.kpxc .ui-icon-pin-w{background-position:-128px -144px}.kpxc .ui-icon-pin-s{background-position:-144px -144px}.kpxc .ui-icon-play{background-position:0 -160px}.kpxc .ui-icon-pause{background-position:-16px -160px}.kpxc .ui-icon-seek-next{background-position:-32px -160px}.kpxc .ui-icon-seek-prev{background-position:-48px -160px}.kpxc .ui-icon-seek-end{background-position:-64px -160px}.kpxc .ui-icon-seek-start{background-position:-80px -160px}.kpxc .ui-icon-seek-first{background-position:-80px -160px}.kpxc .ui-icon-stop{background-position:-96px -160px}.kpxc .ui-icon-eject{background-position:-112px -160px}.kpxc .ui-icon-volume-off{background-position:-128px -160px}.kpxc .ui-icon-volume-on{background-position:-144px -160px}.kpxc .ui-icon-power{background-position:0 -176px}.kpxc .ui-icon-signal-diag{background-position:-16px -176px}.kpxc .ui-icon-signal{background-position:-32px -176px}.kpxc .ui-icon-battery-0{background-position:-48px -176px}.kpxc .ui-icon-battery-1{background-position:-64px -176px}.kpxc .ui-icon-battery-2{background-position:-80px -176px}.kpxc .ui-icon-battery-3{background-position:-96px -176px}.kpxc .ui-icon-circle-plus{background-position:0 -192px}.kpxc .ui-icon-circle-minus{background-position:-16px -192px}.kpxc .ui-icon-circle-close{background-position:-32px -192px}.kpxc .ui-icon-circle-triangle-e{background-position:-48px -192px}.kpxc .ui-icon-circle-triangle-s{background-position:-64px -192px}.kpxc .ui-icon-circle-triangle-w{background-position:-80px -192px}.kpxc .ui-icon-circle-triangle-n{background-position:-96px -192px}.kpxc .ui-icon-circle-arrow-e{background-position:-112px -192px}.kpxc .ui-icon-circle-arrow-s{background-position:-128px -192px}.kpxc .ui-icon-circle-arrow-w{background-position:-144px -192px}.kpxc .ui-icon-circle-arrow-n{background-position:-160px -192px}.kpxc .ui-icon-circle-zoomin{background-position:-176px -192px}.kpxc .ui-icon-circle-zoomout{background-position:-192px -192px}.kpxc .ui-icon-circle-check{background-position:-208px -192px}.kpxc .ui-icon-circlesmall-plus{background-position:0 -208px}.kpxc .ui-icon-circlesmall-minus{background-position:-16px -208px}.kpxc .ui-icon-circlesmall-close{background-position:-32px -208px}.kpxc .ui-icon-squaresmall-plus{background-position:-48px -208px}.kpxc .ui-icon-squaresmall-minus{background-position:-64px -208px}.kpxc .ui-icon-squaresmall-close{background-position:-80px -208px}.kpxc .ui-icon-grip-dotted-vertical{background-position:0 -224px}.kpxc .ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.kpxc .ui-icon-grip-solid-vertical{background-position:-32px -224px}.kpxc .ui-icon-grip-solid-horizontal{background-position:-48px -224px}.kpxc .ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.kpxc .ui-icon-grip-diagonal-se{background-position:-80px -224px}.kpxc .ui-corner-all,.kpxc .ui-corner-top,.kpxc .ui-corner-left,.kpxc .ui-corner-tl{border-top-left-radius:3px}.kpxc .ui-corner-all,.kpxc .ui-corner-top,.kpxc .ui-corner-right,.kpxc .ui-corner-tr{border-top-right-radius:3px}.kpxc .ui-corner-all,.kpxc .ui-corner-bottom,.kpxc .ui-corner-left,.kpxc .ui-corner-bl{border-bottom-left-radius:3px}.kpxc .ui-corner-all,.kpxc .ui-corner-bottom,.kpxc .ui-corner-right,.kpxc .ui-corner-br{border-bottom-right-radius:3px}.kpxc .ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.kpxc .ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666} \ No newline at end of file diff --git a/keepassxc-browser/jquery-ui.min.js b/keepassxc-browser/jquery-ui.min.js index 25398a1..0a0a38c 100644 --- a/keepassxc-browser/jquery-ui.min.js +++ b/keepassxc-browser/jquery-ui.min.js @@ -1,13 +1,13 @@ -/*! jQuery UI - v1.12.1 - 2016-09-14 +/*! jQuery UI - v1.12.1 - 2017-11-16 * http://jqueryui.com -* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js +* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js * Copyright jQuery Foundation and other contributors; Licensed MIT */ -(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("
"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("
"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.widthi?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("

")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("

").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n) -}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("
").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("
").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,.\/:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t(""),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n; -this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("