Merge branch 'hotfix/0.113.1'

CenterForOpenScience · Aug 28, 2017 · 3afd92e · 3afd92e
2 parents 74b9b97 + 980ad45
commit 3afd92e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/app/routes/application.js b/app/routes/application.js
@@ -17,21 +17,26 @@ export default Ember.Route.extend(Analytics, OSFAgnosticAuthRouteMixin, {
     theme: Ember.inject.service(),
 
     beforeModel: function () {
-        // Set the provider ID from the current origin
-        if (window.isProviderDomain) {
-            return this.get('store').query(
-                'preprint-provider',
-                {
-                    filter: {
-                        domain: `${window.location.origin}/`,
+        let detectBrandedDomain = () => {
+            // Set the provider ID from the current origin
+            if (window.isProviderDomain) {
+                return this.get('store').query(
+                    'preprint-provider',
+                    {
+                        filter: {
+                            domain: `${window.location.origin}/`,
+                        }
                     }
-                }
-            ).then(providers => {
-                if (providers.length) {
-                    this.set('theme.id', providers.objectAt(0).get('id'));
-                }
-            });
-        }
+                ).then(providers => {
+                    if (providers.length) {
+                        this.set('theme.id', providers.objectAt(0).get('id'));
+                    }
+                });
+            }
+        };
+        let parentResult = this._super(...arguments);
+        // Chain on to parent's promise if parent returns a promise.
+        return parentResult instanceof Promise ? parentResult.then(detectBrandedDomain) : detectBrandedDomain();
     },
 
     afterModel: function() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preprint-service",
-  "version": "0.113.0",
+  "version": "0.113.1",
   "description": "Center for Open Science Preprint Service",
   "private": true,
   "directories": {