From 1b4c6938f603ada02a16f91c223054298f497e88 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Mon, 14 Dec 2015 21:27:58 +0100
Subject: [PATCH] Hotfix for iOS Safari mergeOptions clashes

---
 js/sources/coa_source.js     | 27 ---------------------------
 js/sources/edition_source.js | 20 +++++++++++++++++++-
 js/stores/edition_store.js   |  5 +----
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 js/sources/coa_source.js

diff --git a/js/sources/coa_source.js b/js/sources/coa_source.js
deleted file mode 100644
index 88c72cce..00000000
--- a/js/sources/coa_source.js
+++ /dev/null
@@ -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;
\ No newline at end of file
diff --git a/js/sources/edition_source.js b/js/sources/edition_source.js
index 3e48d257..462205e0 100644
--- a/js/sources/edition_source.js
+++ b/js/sources/edition_source.js
@@ -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;
\ No newline at end of file
+export default EditionSource;
diff --git a/js/stores/edition_store.js b/js/stores/edition_store.js
index 8fdd681b..ae728ef9 100644
--- a/js/stores/edition_store.js
+++ b/js/stores/edition_store.js
@@ -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) {