optolith/optolith-client
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Small bug fixes in inventory

Browse Source
This commit is contained in:
Lukas Obermann
2016-12-25 17:07:43 +13:00
parent ee54770534
commit 3526e81189
5 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/bundle.js
Vendored
+21 -2
View File
@@ -28978,6 +28978,7 @@
target.range1 = target.range[0];
target.range2 = target.range[1];
target.range3 = target.range[2];
delete target.range;
return target;
}
}
@@ -38581,7 +38582,25 @@
pro: '',
enc: '',
addpenalties: false
}, this.onEvent = (prop, e) => this.setState({ [prop]: e.target.value }), this.onSwitch = prop => this.setState({ [prop]: !this.state[prop] }), this.onValue = (prop, value) => this.setState({ [prop]: value }), this.applyTemplate = () => this.state.template !== 'ITEMTPL_0' && this.setState((0, _extends3.default)({}, _InventoryStore2.default.getTemplate(this.state.template), { id: this.state.id, isTemplateLocked: false })), this.lockTemplate = () => this.state.template !== 'ITEMTPL_0' && this.setState((0, _extends3.default)({}, _InventoryStore2.default.getTemplate(this.state.template), { id: this.state.id })), this.unlockTemplate = () => this.setState({ isTemplateLocked: false }), this.addItem = () => _InventoryActions2.default.addToList(this.state), this.saveItem = () => _InventoryActions2.default.saveItem(this.state), _temp;
}, this.onEvent = (prop, e) => this.setState({ [prop]: e.target.value }), this.onSwitch = prop => this.setState({ [prop]: !this.state[prop] }), this.onValue = (prop, value) => this.setState({ [prop]: value }), this.applyTemplate = () => {
if (this.state.template !== 'ITEMTPL_0') {
let template = (0, _extends3.default)({}, _InventoryStore2.default.getTemplate(this.state.template), { id: this.state.id, isTemplateLocked: false });
template.range1 = template.range[0];
template.range2 = template.range[1];
template.range3 = template.range[2];
delete template.range;
this.setState(template);
}
}, this.lockTemplate = () => {
if (this.state.template !== 'ITEMTPL_0') {
let template = (0, _extends3.default)({}, _InventoryStore2.default.getTemplate(this.state.template), { id: this.state.id });
template.range1 = template.range[0];
template.range2 = template.range[1];
template.range3 = template.range[2];
delete template.range;
this.setState(template);
}
}, this.unlockTemplate = () => this.setState({ isTemplateLocked: false }), this.addItem = () => _InventoryActions2.default.addToList(this.state), this.saveItem = () => _InventoryActions2.default.saveItem(this.state), _temp;
}
render() {
@@ -39328,7 +39347,7 @@
_react2.default.createElement(
'td',
null,
(_InventoryStore2.default.get(ammunition) || {}).name
(_InventoryStore2.default.getTemplate(ammunition) || {}).name
)
),
_react2.default.createElement(
dist/data/DSA5.json
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/utils/data/Item.js
+1
View File
@@ -107,6 +107,7 @@ export default class Item extends Core {
target.range1 = target.range[0];
target.range2 = target.range[1];
target.range3 = target.range[2];
delete target.range;
return target;
}
}
js/views/items/InventoryListItem.js
+1 -1
View File
@@ -98,7 +98,7 @@ export default class InventoryListItem extends Component {
</tr>
<tr>
<td>Munitionstyp</td>
<td>{(InventoryStore.get(ammunition) || {}).name}</td>
<td>{(InventoryStore.getTemplate(ammunition) || {}).name}</td>
</tr>
<tr>
<td>Gewicht</td>
js/views/items/ItemEditor.js
+20 -2
View File
@@ -57,8 +57,26 @@ export default class ItemEditor extends Component {
onSwitch = prop => this.setState({ [prop]: !this.state[prop] });
onValue = (prop, value) => this.setState({ [prop]: value });
applyTemplate = () => this.state.template !== 'ITEMTPL_0' && this.setState({ ...InventoryStore.getTemplate(this.state.template), id: this.state.id, isTemplateLocked: false });
lockTemplate = () => this.state.template !== 'ITEMTPL_0' && this.setState({ ...InventoryStore.getTemplate(this.state.template), id: this.state.id });
applyTemplate = () => {
if (this.state.template !== 'ITEMTPL_0') {
let template = { ...InventoryStore.getTemplate(this.state.template), id: this.state.id, isTemplateLocked: false };
template.range1 = template.range[0];
template.range2 = template.range[1];
template.range3 = template.range[2];
delete template.range;
this.setState(template);
}
};
lockTemplate = () => {
if (this.state.template !== 'ITEMTPL_0') {
let template = { ...InventoryStore.getTemplate(this.state.template), id: this.state.id };
template.range1 = template.range[0];
template.range2 = template.range[1];
template.range3 = template.range[2];
delete template.range;
this.setState(template);
}
};
unlockTemplate = () => this.setState({ isTemplateLocked: false });
addItem = () => InventoryActions.addToList(this.state);