Added support for piecemaps; Fixed lots of private-chat bugs

Fixed #90
AnthyG · Nov 17, 2017 · 4c14024 · 4c14024
1 parent b0831d4
commit 4c14024
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 274 deletions.
diff --git a/css/all.css b/css/all.css
diff --git a/css/spectre.min.css b/css/spectre.min.css
diff --git a/data-default/users/content-default.json b/data-default/users/content-default.json
@@ -21,7 +21,7 @@
         "permission_rules": {
             ".*": {
                 "files_allowed": "data.json",
-                "files_allowed_optional": ".+\\.(png|jpg|jpeg|gif)",
+                "files_allowed_optional": ".+\\.(png|jpg|jpeg|gif)(.piecemap.msgpack)?",
                 "max_size": 100000
             },
             "bitmsg/.*@zeroid.bit": { "max_size": 125000 },

diff --git a/index.html b/index.html
@@ -195,6 +195,10 @@
             <div tab="LastSeen" class="panel">
                 <div class="panel-body" style="overflow-x: hidden;">
                     <p>Total number of logged-in users: <b id="last_seen_list_c">0</b></p>
+                    <div class="input-group">
+                        <input class="form-input" type="text" id="lastseen_filterer" onkeypress="if (event.keyCode == 13 && !event.shiftKey) { page.lastSeenList(true); return false; }" />
+                        <button class="btn btn-action input-group-btn" onclick="return page.lastSeenList(true);">Search</button>
+                    </div>
                     <dl id="last_seen_list">
 
                     </dl>
@@ -319,17 +323,20 @@ <h6 class='col-12' style='margin-bottom: .4rem;'><a href='?u/{{username}}'>{{use
         });
     </script> -->
     <script>
-        function config$bH(goingback) {
-            console.log("configuring bodyHeight..")
+        function config$bH(goingback, is_private) {
+            var is_private = is_private ? 'private_' : ''
+
+            console.log("configuring bodyHeight..", is_private)
 
             function configIt(alert) {
                 var alert = alert || false
 
                 // $('body').height($('body>.container')[0].scrollHeight + 28) // Disabling this, is visually preferred, but the complete thing doesn't work without it >:|
                 // $('body').css('overflow-x', 'hidden')
 
-                var $mp = $('#messages').parent()
-                if ($('#main-tabs').attr('curtab') === "Lobby" && (!goingback || $mp[0].scrollHeight - 25 <= $mp.scrollTop())) {
+                var $mp = $('#' + is_private + 'messages').parent()
+                if (($('#main-tabs').attr('curtab') === "Lobby" || $('#main-tabs').attr('curtab') === "PrivateChat") &&
+                    (!goingback || $mp[0].scrollHeight - 25 <= $mp.scrollTop())) {
                     $mp.scrollTop($mp[0].scrollHeight)
                         //     $(document).scrollTop($('body>.container')[0].scrollHeight + 28)
                 }
@@ -338,7 +345,7 @@ <h6 class='col-12' style='margin-bottom: .4rem;'><a href='?u/{{username}}'>{{use
                 }
 
                 if (alert)
-                    console.log("bodyHeight configured!")
+                    console.log("bodyHeight configured!", is_private)
             }
             $(document).ready(function() {
                 configIt(false)