diff options
| -rw-r--r-- | package-lock.json | 8 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | public/scripts/chat.js | 49 | ||||
| -rw-r--r-- | public/scripts/encryption.js | 2 | ||||
| -rw-r--r-- | public/styles/main.sass | 8 |
5 files changed, 61 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json index ad8b4d5..f6f5829 100644 --- a/package-lock.json +++ b/package-lock.json @@ -199,8 +199,7 @@ "@fortawesome/fontawesome-free": { "version": "5.6.3", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz", - "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==", - "dev": true + "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==" }, "@mattiasbuelens/web-streams-polyfill": { "version": "0.1.0-alpha.4", @@ -6433,6 +6432,11 @@ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" }, + "jquery-ui-bundle": { + "version": "1.12.1-migrate", + "resolved": "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1-migrate.tgz", + "integrity": "sha1-uTQ+LDEHQ1J2Ms/4vtsMXpYAsUw=" + }, "js-base64": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", diff --git a/package.json b/package.json index 351509f..16a49ca 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "fingerprintjs2": "^2.0.6", "html-minifier": "^3.5.21", "jquery": "^3.3.1", + "jquery-ui-bundle": "^1.12.1-migrate", "jssha": "^2.3.1", "minify": "^4.1.0", "moment": "^2.24.0", diff --git a/public/scripts/chat.js b/public/scripts/chat.js index 497349b..89bdff3 100644 --- a/public/scripts/chat.js +++ b/public/scripts/chat.js @@ -6,7 +6,8 @@ */ // general imports -const $ = require('jquery'); +const $ = jQuery = require('jquery'); +require('jquery-ui-bundle'); const swal = require('sweetalert'); const xkcdPassword = require('xkcd-password'); const encryption = require('./encryption'); @@ -296,14 +297,54 @@ function chat() { * Shows modal for adding a contact */ function addContact() { + const observer = new MutationObserver(() => { + $('#contact_id_input') + .on('keydown', (event) => { + if (event.keyCode === $.ui.keyCode.TAB + && $(this) + .autocomplete('instance').menu.active) { + event.preventDefault(); + } + }) + .autocomplete({ + minLength: 0, + source: (request, response) => { + response($.ui.autocomplete.filter( + wordList, request.term.split(/,\s*/) + .pop(), + )); + }, + focus: () => false, + select: (event, ui) => { + const terms = this.value.split(/,\s*/); + terms.pop(); + terms.push(ui.item.value); + terms.push(''); + this.value = terms.join('-'); + return false; + }, + }); + }); + + observer.observe($('body') + .get(0), { + attributes: true, + childList: true, + subtree: true, + }); + swal('Add a contact', { buttons: true, - content: 'input', - attributes: { - placeholder: 'Contact ID', + content: { + element: 'input', + attributes: { + id: 'contact_id_input', + placeholder: 'Contact ID', + }, }, }) .then((contactId) => { + observer.disconnect(); if (contactId.match(/^([a-zA-Z]*-[a-zA-Z]*)+$/)) { connect(contactId) .then(() => swal({ diff --git a/public/scripts/encryption.js b/public/scripts/encryption.js index 735cc33..415a355 100644 --- a/public/scripts/encryption.js +++ b/public/scripts/encryption.js @@ -326,7 +326,7 @@ const self = module.exports = { .then(async (components) => { const fingerprintHash = fingerprintJs.x64hash128(components.map(pair => pair.value) .join(), 31); - console.log(fingerprintHash); + console.log(`[LOG] Your fingerprint is: ${fingerprintHash}`); let shaObj = new JsSHA('SHA3-512', 'TEXT'); shaObj.update(passphrase); const passphraseHash = shaObj.getHash('HEX'); diff --git a/public/styles/main.sass b/public/styles/main.sass index a6f0d2e..94bfe56 100644 --- a/public/styles/main.sass +++ b/public/styles/main.sass @@ -1,4 +1,12 @@ +/*! + / main.sass + / Copyright (c) 2019, Texx + / License: MIT + / See https://github.com/texxme/Texx/blob/master/LICENSE + / + // Normal input doesn't work here for npm packages! @import "../../node_modules/bulma/bulma" +@import "../../node_modules/jquery-ui-bundle/jquery-ui.min" @import "style" @import "pin" |