diff options
Diffstat (limited to 'src/client/util')
| -rw-r--r-- | src/client/util/CurrentUserUtils.ts | 7 | ||||
| -rw-r--r-- | src/client/util/ServerStats.tsx | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index e338d8e84..e8947f190 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -30,8 +30,7 @@ import { LinkManager } from "./LinkManager"; import { ScriptingGlobals } from "./ScriptingGlobals"; import { ColorScheme, SettingsManager } from "./SettingsManager"; import { UndoManager } from "./UndoManager"; -import { PresElementBox } from "../views/nodes/trails"; -import { ImportElementBox } from "../views/nodes/importBox/importElementBox"; +import { ImportElementBox } from "../views/nodes/importBox/ImportElementBox"; interface Button { // DocumentOptions fields a button can set @@ -967,10 +966,8 @@ export class CurrentUserUtils { input.multiple = true; input.accept = ".zip, application/pdf, video/*, image/*, audio/*"; input.onchange = async _e => { - const upload = Utils.prepend("/uploadDoc"); - const formData = new FormData(); const file = input.files?.[0]; - if (file?.type === 'application/zip') { + if (file?.type === 'application/zip' || file?.type === 'application/x-zip-compressed') { const doc = await Doc.importDocument(file); // NOT USING SOLR, so need to replace this with something else // if (doc instanceof Doc) { // setTimeout(() => SearchUtil.Search(`{!join from=id to=proto_i}id:link*`, true, {}).then(docs => diff --git a/src/client/util/ServerStats.tsx b/src/client/util/ServerStats.tsx index b6aa4d95a..6a6ec158e 100644 --- a/src/client/util/ServerStats.tsx +++ b/src/client/util/ServerStats.tsx @@ -4,6 +4,8 @@ import * as React from 'react'; import { MainViewModal } from '../views/MainViewModal'; import './SharingManager.scss'; import { PingManager } from './PingManager'; +import { StrCast } from '../../fields/Types'; +import { Doc } from '../../fields/Doc'; @observer export class ServerStats extends React.Component<{}> { @@ -44,7 +46,7 @@ export class ServerStats extends React.Component<{}> { display: "flex", height: 300, width: 400, - background: "black", + background: StrCast(Doc.UserDoc().userBackgroundColor), opacity: 0.6}}> <div style={{width: 300,height: 100,margin: "auto",display: "flex",flexDirection: "column"}}> {PingManager.Instance.IsBeating ? 'The server connection is active' : |