From 30073b88f1e6371e607af2577fd15e7fafcfd5cb Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Wed, 13 Dec 2017 03:49:35 -0600 Subject: [PATCH 1/2] s/setup/setup --- docs/_docs/01-01-talk-quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_docs/01-01-talk-quickstart.md b/docs/_docs/01-01-talk-quickstart.md index c5e7a20ee..811bfe5ed 100644 --- a/docs/_docs/01-01-talk-quickstart.md +++ b/docs/_docs/01-01-talk-quickstart.md @@ -26,7 +26,7 @@ to persist data. The following versions are supported: An optional dependency for Talk is [Docker](https://www.docker.com/community-edition#/download){:target="_blank"}. -It is used during [development](#development) to setup the database and can be +It is used during [development](#development) to set up the database and can be used to [install via Docker](#installation-from-docker). We have tested Talk and this documentation with versions {{ site.versions.docker }}. @@ -182,4 +182,4 @@ machine. At this point you've successfully installed, configured, and ran your very own instance of Talk! Continue through this documentation on this site to learn more -on how to configure, develop with, and contribute to Talk! \ No newline at end of file +on how to configure, develop with, and contribute to Talk! From df925f5a1a4743a15940ce6469508b09e9b506f6 Mon Sep 17 00:00:00 2001 From: Jeff Nelson Date: Wed, 13 Dec 2017 07:38:10 -0600 Subject: [PATCH 2/2] Fix logic to generate asset_url even if the asset_id is provided so an error is avoided --- client/coral-embed/src/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js index f60a88439..935972795 100644 --- a/client/coral-embed/src/index.js +++ b/client/coral-embed/src/index.js @@ -70,10 +70,9 @@ export class Talk { // Extract the asset url. if (opts.asset_url) { query.asset_url = opts.asset_url; - } else if (!opts.asset_id) { + } else { - // The asset url was not provided and the asset id was also not provided, - // we need to infer the asset url from details on the page. + // The asset url was not provided so we need to infer the asset url from // details on the page. try { query.asset_url = document.querySelector('link[rel="canonical"]').href;