Take a buffer ID in getBuffer

This commit is contained in:
Simon Ser 2021-01-21 22:02:53 +01:00
parent 50ea6e121e
commit dd35f1df95

View File

@ -99,7 +99,12 @@ function updateState(state, updater) {
return { ...state, ...updated };
}
function getBuffer(state, network, name) {
function getBuffer(state, id) {
switch (typeof id) {
case "number":
return state.buffers.get(id);
case "object":
var network = id.network, name = id.name;
if (!network) {
network = state.activeNetwork;
}
@ -109,6 +114,9 @@ function getBuffer(state, network, name) {
}
}
return null;
default:
throw new Error("Invalid buffer ID type: " + (typeof id));
}
}
export default class App extends Component {
@ -217,17 +225,7 @@ export default class App extends Component {
setBufferState(id, updater, callback) {
this.setState((state) => {
var buf;
switch (typeof id) {
case "object":
buf = getBuffer(state, id.network, id.name);
break;
case "number":
buf = state.buffers.get(id);
break;
default:
throw new Error("Invalid buffer ID type: " + (typeof id));
}
var buf = getBuffer(state, id);
if (!buf) {
return;
}
@ -246,7 +244,7 @@ export default class App extends Component {
createBuffer(netID, name, callback) {
var id = null;
this.setState((state) => {
if (getBuffer(state, netID, name)) {
if (getBuffer(state, { network: netID, name })) {
return;
}
@ -295,7 +293,7 @@ export default class App extends Component {
});
var buf;
this.setState((state) => {
buf = getBuffer(state, null, name);
buf = getBuffer(state, { name });
if (!buf) {
return;
}