1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

Hotfix for iOS Safari mergeOptions clashes

This commit is contained in:
Brett Sun 2015-12-14 21:27:58 +01:00
parent cef2785438
commit 1b4c6938f6
3 changed files with 20 additions and 32 deletions

View File

@ -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;

View File

@ -13,7 +13,25 @@ const EditionSource = {
success: EditionActions.successFetchEdition,
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
}
};
export default EditionSource;
export default EditionSource;

View File

@ -5,9 +5,6 @@ import { alt } from '../alt';
import EditionActions from '../actions/edition_actions';
import EditionSource from '../sources/edition_source';
import CoaSource from '../sources/coa_source';
import { mergeOptions } from '../utils/general_utils';
class EditionStore {
@ -22,7 +19,7 @@ class EditionStore {
};
this.bindActions(EditionActions);
this.registerAsync(mergeOptions(EditionSource, CoaSource));
this.registerAsync(EditionSource);
}
onFetchEdition(idToFetch) {