Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-12-10 22:16:49 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/a1346054/onionshare into a1346054-develop

Browse source
This commit is contained in:
Micah Lee 2021-12-04 20:34:07 -08:00
commit a71a4f9baa
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
21 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/onionshare_cli/resources/static/js/chat.js
View file

@ -11,7 +11,7 @@ $(function () {
// Store current username received from app context
var current_username = $('#username').val();
// On browser connect, emit a socket event to be added to
// On browser connect, emit a socket event to be added to
// room and assigned random username
socket.on('connect', function () {
socket.emit('joined', {});
@ -148,7 +148,7 @@ var getScrollDiffBefore = function () {
var scrollBottomMaybe = function (scrollDiff) {
// Scrolls to bottom if the user is scrolled at bottom
// if the user has scrolled upp, it wont scroll at bottom.
// if the user has scrolled up, it won't scroll at bottom.
// Note: when a user themselves send a message, it will still
// scroll to the bottom even if they had scrolled up before.
if (scrollDiff > 0) {