(
+ unselectable={IS_IE8}>
{value + (unit ? ' ' + unit : '')}
);
diff --git a/tgui/packages/tgui/components/Slider.js b/tgui/packages/tgui/components/Slider.js
index c8967dcecf6..55ae4ba6c14 100644
--- a/tgui/packages/tgui/components/Slider.js
+++ b/tgui/packages/tgui/components/Slider.js
@@ -1,9 +1,17 @@
import { clamp01, keyOfMatchingRange, scale } from 'common/math';
import { classes } from 'common/react';
+import { IS_IE8 } from '../byond';
import { computeBoxClassName, computeBoxProps } from './Box';
import { DraggableControl } from './DraggableControl';
+import { NumberInput } from './NumberInput';
export const Slider = props => {
+ // IE8: I don't want to support a yet another component on IE8.
+ if (IS_IE8) {
+ return (
+
+ );
+ }
const {
// Draggable props (passthrough)
animated,
diff --git a/tgui/packages/tgui/hotkeys.js b/tgui/packages/tgui/hotkeys.js
index b2e4650053a..30c1b910bf4 100644
--- a/tgui/packages/tgui/hotkeys.js
+++ b/tgui/packages/tgui/hotkeys.js
@@ -1,5 +1,5 @@
+import { callByond, IS_IE8 } from './byond';
import { createLogger } from './logging';
-import { callByond, tridentVersion } from './byond';
const logger = createLogger('hotkeys');
@@ -223,13 +223,13 @@ export const hotKeyMiddleware = store => {
subscribeToKeyPresses((e, eventType) => {
// IE8: Can't determine the focused element, so by extension it passes
// keypresses when inputs are focused.
- if (tridentVersion > 4) {
+ if (!IS_IE8) {
handlePassthrough(e, eventType);
}
handleHotKey(e, eventType, dispatch);
});
// IE8: focusin/focusout only available on IE9+
- if (tridentVersion > 4) {
+ if (!IS_IE8) {
// Clean up when browser window completely loses focus
subscribeToLossOfFocus(() => {
releaseHeldKeys();
diff --git a/tgui/packages/tgui/index.js b/tgui/packages/tgui/index.js
index 8a8581a82dc..ff75401f0a8 100644
--- a/tgui/packages/tgui/index.js
+++ b/tgui/packages/tgui/index.js
@@ -9,14 +9,16 @@ import { loadCSS } from 'fg-loadcss';
import { render } from 'inferno';
import { setupHotReloading } from 'tgui-dev-server/link/client';
import { backendUpdate } from './backend';
-import { tridentVersion } from './byond';
+import { IS_IE8 } from './byond';
import { setupDrag } from './drag';
import { createLogger } from './logging';
import { createStore, StoreProvider } from './store';
+const enteredBundleAt = Date.now();
+
const logger = createLogger();
const store = createStore();
-const reactRoot = document.getElementById('react-root');
+let reactRoot;
let initialRender = true;
@@ -42,6 +44,9 @@ const renderLayout = () => {
);
+ if (!reactRoot) {
+ reactRoot = document.getElementById('react-root');
+ }
render(element, reactRoot);
}
catch (err) {
@@ -51,13 +56,19 @@ const renderLayout = () => {
// Report rendering time
if (process.env.NODE_ENV !== 'production') {
const finishedAt = Date.now();
- const diff = finishedAt - startedAt;
- const diffFrames = (diff / 16.6667).toFixed(2);
- logger.debug(`rendered in ${diff}ms (${diffFrames} frames)`);
if (initialRender) {
- const diff = finishedAt - window.__inception__;
- const diffFrames = (diff / 16.6667).toFixed(2);
- logger.log(`fully loaded in ${diff}ms (${diffFrames} frames)`);
+ logger.debug('serving from:', location.href);
+ logger.debug('bundle entered in', timeDiff(
+ window.__inception__, enteredBundleAt));
+ logger.debug('initialized in', timeDiff(
+ enteredBundleAt, startedAt));
+ logger.debug('rendered in', timeDiff(
+ startedAt, finishedAt));
+ logger.log('fully loaded in', timeDiff(
+ window.__inception__, finishedAt));
+ }
+ else {
+ logger.debug('rendered in', timeDiff(startedAt, finishedAt));
}
}
if (initialRender) {
@@ -65,6 +76,12 @@ const renderLayout = () => {
}
};
+const timeDiff = (startedAt, finishedAt) => {
+ const diff = finishedAt - startedAt;
+ const diffFrames = (diff / 16.6667).toFixed(2);
+ return `${diff}ms (${diffFrames} frames)`;
+};
+
// Parse JSON and report all abnormal JSON strings coming from BYOND
const parseStateJson = json => {
let reviver = (key, value) => {
@@ -77,7 +94,7 @@ const parseStateJson = json => {
};
// IE8: No reviver for you!
// See: https://stackoverflow.com/questions/1288962
- if (tridentVersion <= 4) {
+ if (IS_IE8) {
reviver = undefined;
}
try {
@@ -130,7 +147,7 @@ const setupApp = () => {
};
// IE8: Wait for DOM to properly load
-if (tridentVersion <= 4 && document.readyState === 'loading') {
+if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', setupApp);
}
else {
diff --git a/tgui/packages/tgui/layouts/Layout.js b/tgui/packages/tgui/layouts/Layout.js
index 7a17612fdeb..364564f60aa 100644
--- a/tgui/packages/tgui/layouts/Layout.js
+++ b/tgui/packages/tgui/layouts/Layout.js
@@ -1,5 +1,5 @@
import { classes } from 'common/react';
-import { tridentVersion } from '../byond';
+import { IS_IE8 } from '../byond';
/**
* Brings Layout__content DOM element back to focus.
@@ -8,7 +8,7 @@ import { tridentVersion } from '../byond';
*/
export const refocusLayout = () => {
// IE8: Focus method is seemingly fucked.
- if (tridentVersion <= 4) {
+ if (IS_IE8) {
return;
}
const element = document.getElementById('Layout__content');
diff --git a/tgui/packages/tgui/layouts/Window.js b/tgui/packages/tgui/layouts/Window.js
index 21f8e1792da..2b8fafdf9ea 100644
--- a/tgui/packages/tgui/layouts/Window.js
+++ b/tgui/packages/tgui/layouts/Window.js
@@ -2,7 +2,7 @@ import { classes } from 'common/react';
import { decodeHtmlEntities, toTitleCase } from 'common/string';
import { Component, Fragment } from 'inferno';
import { useBackend } from '../backend';
-import { runCommand, tridentVersion, winset } from '../byond';
+import { IS_IE8, runCommand, winset } from '../byond';
import { Box, Icon } from '../components';
import { UI_DISABLED, UI_INTERACTIVE, UI_UPDATE } from '../constants';
import { dragStartHandler, resizeStartHandler } from '../drag';
@@ -134,7 +134,7 @@ const TitleBar = props => {
// IE8: Use a plain character instead of a unicode symbol.
// eslint-disable-next-line react/no-unknown-property
onclick={onClose}>
- {tridentVersion <= 4 ? 'x' : '×'}
+ {IS_IE8 ? 'x' : '×'}