mirror of
https://github.com/ascribe/onion.git
synced 2025-02-14 21:10:27 +01:00
Hotfix for iOS Safari mergeOptions clashes
This commit is contained in:
parent
cef2785438
commit
1b4c6938f6
@ -1,27 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
import requests from '../utils/requests';
|
|
||||||
|
|
||||||
import EditionActions from '../actions/edition_actions';
|
|
||||||
|
|
||||||
|
|
||||||
const CoaSource = {
|
|
||||||
lookupCoa: {
|
|
||||||
remote(state) {
|
|
||||||
return requests.get('coa', { id: state.edition.coa });
|
|
||||||
},
|
|
||||||
|
|
||||||
success: EditionActions.successFetchCoa,
|
|
||||||
error: EditionActions.errorCoa
|
|
||||||
},
|
|
||||||
|
|
||||||
performCreateCoa: {
|
|
||||||
remote(state) {
|
|
||||||
return requests.post('coa_create', {body: { bitcoin_id: state.edition.bitcoin_id }});
|
|
||||||
},
|
|
||||||
success: EditionActions.successFetchCoa,
|
|
||||||
error: EditionActions.errorCoa
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default CoaSource;
|
|
@ -13,6 +13,24 @@ const EditionSource = {
|
|||||||
|
|
||||||
success: EditionActions.successFetchEdition,
|
success: EditionActions.successFetchEdition,
|
||||||
error: EditionActions.errorEdition
|
error: EditionActions.errorEdition
|
||||||
|
},
|
||||||
|
|
||||||
|
// For COA
|
||||||
|
lookupCoa: {
|
||||||
|
remote(state) {
|
||||||
|
return requests.get('coa', { id: state.edition.coa });
|
||||||
|
},
|
||||||
|
|
||||||
|
success: EditionActions.successFetchCoa,
|
||||||
|
error: EditionActions.errorCoa
|
||||||
|
},
|
||||||
|
|
||||||
|
performCreateCoa: {
|
||||||
|
remote(state) {
|
||||||
|
return requests.post('coa_create', {body: { bitcoin_id: state.edition.bitcoin_id }});
|
||||||
|
},
|
||||||
|
success: EditionActions.successFetchCoa,
|
||||||
|
error: EditionActions.errorCoa
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,9 +5,6 @@ import { alt } from '../alt';
|
|||||||
import EditionActions from '../actions/edition_actions';
|
import EditionActions from '../actions/edition_actions';
|
||||||
|
|
||||||
import EditionSource from '../sources/edition_source';
|
import EditionSource from '../sources/edition_source';
|
||||||
import CoaSource from '../sources/coa_source';
|
|
||||||
|
|
||||||
import { mergeOptions } from '../utils/general_utils';
|
|
||||||
|
|
||||||
|
|
||||||
class EditionStore {
|
class EditionStore {
|
||||||
@ -22,7 +19,7 @@ class EditionStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.bindActions(EditionActions);
|
this.bindActions(EditionActions);
|
||||||
this.registerAsync(mergeOptions(EditionSource, CoaSource));
|
this.registerAsync(EditionSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
onFetchEdition(idToFetch) {
|
onFetchEdition(idToFetch) {
|
||||||
|
Loading…
Reference in New Issue
Block a user