Adium related fixes

psi-im · Jul 7, 2024 · fb6e58d · fb6e58d
1 parent 21097d9
commit fb6e58d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/theme.cpp b/src/theme.cpp
@@ -146,13 +146,13 @@ QByteArray Theme::loadData(const QString &fileName, const QString &themePath, bo
         }
 
         if (!z.readFile(fileName, &ba)) {
-            auto n = "/" + fileName;
-            if (loaded) {
-                *loaded = z.readFile(n, &ba);
-            } else {
-                z.readFile(n, &ba);
+            if (!z.readFile("/" + fileName, &ba)) {
+                return {};
             }
         }
+        if (loaded) {
+            *loaded = true;
+        }
     }
 #endif
 

diff --git a/themes/chatview/adium/Template.html b/themes/chatview/adium/Template.html
@@ -214,10 +214,11 @@
 
         //Auto-scroll to bottom.  Use nearBottom to determine if a scrollToBottom is desired.
         function nearBottom() {
-            return ( document.body.scrollTop >= ( document.body.offsetHeight - ( window.innerHeight * 1.2 ) ) );
+            return ( (document.documentElement.scrollTop + document.body.scrollTop) >= ( document.body.offsetHeight - ( window.innerHeight * 1.2 ) ) );
         }
         function scrollToBottom() {
             document.body.scrollTop = document.body.offsetHeight;
+            document.documentElement.scrollTop = document.body.offsetHeight;
         }
 
         //Dynamically exchange the active stylesheet

diff --git a/themes/chatview/adium/adapter.js b/themes/chatview/adium/adapter.js
@@ -37,7 +37,7 @@ var adapter = {
             if (value)  {
                 baseDir = value.split("/")[0] + "/";
             }
-            loader.setHttpResourcePath("/" + baseDir + "Contents/Resources");
+            loader.setHttpResourcePath(baseDir + "Contents/Resources");
 
             //chat.console("DEBUG: loading " + loader.themeId);
             var resources = ["FileTransferRequest.html",