ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/1.5.4

Browse Source
This commit is contained in:
ntr 2019-10-09 13:21:09 +11:00
commit 68ff78efb1
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/assets/styles/instance.mobile.less
View File

@ -17,6 +17,7 @@
@media (max-width: 800px) { @media (max-width: 800px) {
.instance { .instance {
overflow-y: scroll;
font-size: 8pt; font-size: 8pt;
display: grid; display: grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;

2
client/src/components/demo.jsx
View File

@ -45,8 +45,6 @@ function Demo(args) {
const { combiner, items, equipping, equipped, players } = demo; const { combiner, items, equipping, equipped, players } = demo;
console.log(items);
const vboxDemo = () => { const vboxDemo = () => {
function inventoryBtn(i, j) { function inventoryBtn(i, j) {
if (!i) return <button disabled class='empty' >&nbsp;</button>; if (!i) return <button disabled class='empty' >&nbsp;</button>;

13
client/src/components/instance.component.jsx
View File

@ -76,7 +76,7 @@ class Instance extends Component {
} }
return ( return (
<main id="instance" class='instance' onClick={instanceClick} onMouseOver={() => setInfo(null)} onTouchMove={onTouchMove}> <main id="instance" class='instance' onClick={instanceClick} onMouseOver={() => setInfo(null)}>
<Vbox /> <Vbox />
<InfoContainer /> <InfoContainer />
<InstanceConstructsContainer /> <InstanceConstructsContainer />
@ -85,12 +85,19 @@ class Instance extends Component {
} }
componentDidMount() { componentDidMount() {
this.bindSwipes(); if (!this.h) this.bindSwipes();
}
componentDidUpdate() {
if (!this.h) this.bindSwipes();
} }
bindSwipes() { bindSwipes() {
const instance = document.getElementById('instance'); const instance = document.getElementById('instance');
if (!instance) return setTimeout(this.bindSwipes, 50); if (!instance) {
console.log('no instance, binding in 50');
return setTimeout(this.bindSwipes, 50);
}
if (this.h) this.h.destroy(); if (this.h) this.h.destroy();
this.h = new Hammer(instance); this.h = new Hammer(instance);
this.h.on('swiperight', () => { this.h.on('swiperight', () => {