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

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
ntr 2019-11-04 20:47:26 +11:00
commit 0042c6f432
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/components/instance.constructs.jsx
View File

@ -153,7 +153,10 @@ function Construct(props) {
const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`; const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
return ( return (
<label onDragStart={skillClick} key={i} draggable="true"> <label onDragStart={ev => {
ev.dataTransfer.setData('text', '');
skillClick(ev);
}} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
<button <button
key={i} key={i}
disabled={!skill && !equipping} disabled={!skill && !equipping}
@ -197,7 +200,7 @@ function Construct(props) {
return ( return (
<label onDragStart={specClick} key={i} draggable="true"> <label onDragStart={specClick} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
<button <button
key={i} key={i}
onClick={specClick} onClick={specClick}

9
client/src/components/vbox.component.jsx
View File

@ -217,7 +217,9 @@ class Vbox extends preact.Component {
const vboxObject = shapes[v] ? shapes[v]() : v; const vboxObject = shapes[v] ? shapes[v]() : v;
return ( return (
<label draggable='true'> <label draggable='true'
onDragStart={ev => ev.dataTransfer.setData('text', '')}
onDragEnd={clearVboxSelected}>
<button <button
class={classes} class={classes}
onMouseOver={e => vboxHover(e, v)} onMouseOver={e => vboxHover(e, v)}
@ -327,7 +329,10 @@ class Vbox extends preact.Component {
const invObject = shapes[v] ? shapes[v]() : v; const invObject = shapes[v] ? shapes[v]() : v;
return ( return (
<label draggable="true"> <label
draggable='true'
onDragStart={ev => ev.dataTransfer.setData('text', '')}
onDragEnd={() => combinerChange([])}>
<button <button
class={classes} class={classes}
onMouseOver={e => vboxHover(e, v)} onMouseOver={e => vboxHover(e, v)}