More changes suggested by @dlongley.

digitalbazaar · Jan 20, 2020 · c1c0221 · c1c0221
1 parent 6a92eac
commit c1c0221
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/lib/documentLoaders/xhr.js b/lib/documentLoaders/xhr.js
@@ -87,8 +87,8 @@ module.exports = ({
 
     // handle Link Header (avoid unsafe header warning by existence testing)
     let linkHeader;
-    if(REGEX_LINK_HEADER.test(req.getAllResponseHeaders()) &&
-      contentType !== 'application/ld+json') {
+    if(contentType !== 'application/ld+json' &&
+      REGEX_LINK_HEADER.test(req.getAllResponseHeaders())) {
       linkHeader = req.getResponseHeader('Link');
     }
     if(linkHeader && contentType !== 'application/ld+json') {

diff --git a/lib/jsonld.js b/lib/jsonld.js
@@ -935,16 +935,17 @@ jsonld.get = async function(url, options) {
     }
   } catch(e) {
     if(e.name === 'jsonld.InvalidScriptElement') {
+      // pass error detected in HTML decode
       throw (e);
-    } else {
-      throw new JsonLdError(
-        'Could not retrieve a JSON-LD document from the URL.',
-        'jsonld.LoadDocumentError', {
-          code: 'loading document failed',
-          cause: e,
-          remoteDoc
-        });
     }
+    // otherwise, general loading error
+    throw new JsonLdError(
+      'Could not retrieve a JSON-LD document from the URL.',
+      'jsonld.LoadDocumentError', {
+        code: 'loading document failed',
+        cause: e,
+        remoteDoc
+      });
   }
 
   return remoteDoc;