Revert "Hotfix for iOS Safari mergeOptions clashes"

This reverts commit 1b4c6938f6.

The actual problem was the late loading of the polyfills.

js/sources/coa_source.js

@@ -0,0 +1,27 @@
+'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;

js/sources/edition_source.js

@@ -13,24 +13,6 @@ 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
     }
 };
 

js/stores/edition_store.js

@@ -5,6 +5,9 @@ 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 {
@@ -19,7 +22,7 @@ class EditionStore {
         };
 
         this.bindActions(EditionActions);
-        this.registerAsync(EditionSource);
+        this.registerAsync(mergeOptions(EditionSource, CoaSource));
     }
 
     onFetchEdition(idToFetch) {