aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/client.js7
-rw-r--r--res/css/des.css2
2 files changed, 7 insertions, 2 deletions
diff --git a/res/client.js b/res/client.js
index a7560d6..e818b1f 100644
--- a/res/client.js
+++ b/res/client.js
@@ -1596,7 +1596,7 @@ client_Main.prototype = {
if(StringTools.startsWith(url,"/")) {
var host = $global.location.hostname;
var port = $global.location.port;
- url = "" + protocol + "//" + host + ":" + port + url;
+ url = "" + protocol + "//" + host + (port.length > 0 ? ":" + port : port) + url;
}
if(!StringTools.startsWith(url,"http")) {
url = "" + protocol + "//" + url;
@@ -1677,7 +1677,7 @@ client_Main.prototype = {
var data = JSON.parse(e.data);
if(this.config != null && this.config.isVerbose) {
var t = data.type;
- haxe_Log.trace("Event: " + data.type,{ fileName : "src/client/Main.hx", lineNumber : 456, className : "client.Main", methodName : "onMessage", customParams : [Reflect.field(data,t.charAt(0).toLowerCase() + HxOverrides.substr(t,1,null))]});
+ haxe_Log.trace("Event: " + data.type,{ fileName : "src/client/Main.hx", lineNumber : 457, className : "client.Main", methodName : "onMessage", customParams : [Reflect.field(data,t.charAt(0).toLowerCase() + HxOverrides.substr(t,1,null))]});
}
client_JsApi.fireEvents(data);
switch(data.type) {
@@ -1915,6 +1915,9 @@ client_Main.prototype = {
case "Caching":
text = "" + Lang.get("caching") + " " + data1.data;
break;
+ case "Canceled":
+ this.hideDynamicChin();
+ return;
case "Downloading":
text = Lang.get("downloading");
break;
diff --git a/res/css/des.css b/res/css/des.css
index f047714..0a88856 100644
--- a/res/css/des.css
+++ b/res/css/des.css
@@ -800,6 +800,7 @@ footer#footer {
font-size: .8em;
font-style: normal;
color: var(--midground);
+ flex-shrink: 0;
}
#messagebuffer .text {
@@ -808,6 +809,7 @@ footer#footer {
.server-whisper {
font-style: italic;
+ word-break: break-word;
}
#scroll-to-chat-end {
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage