From 8dfd6fcecc780de26acf17f78aba953573c76aa5 Mon Sep 17 00:00:00 2001
From: James Baxley <james.baxley@newspring.cc>
Date: Mon, 2 Jan 2017 22:22:56 -0500
Subject: [PATCH] Minor app tweaks (#1697)

* don't show audio if it isn't there

* support new line tags

* better handle speakers

* eslint and build bump
---
 imports/pages/series/series.SingleVideo.js    | 24 ++++++++++---------
 .../content/__tests__/content.speakers.js     | 16 +++++++++++--
 imports/util/content/content.speakers.js      | 12 +++++++---
 mobile-config.js                              |  4 ++--
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/imports/pages/series/series.SingleVideo.js b/imports/pages/series/series.SingleVideo.js
index a787798b3..ed5b872a2 100644
--- a/imports/pages/series/series.SingleVideo.js
+++ b/imports/pages/series/series.SingleVideo.js
@@ -105,17 +105,19 @@ class SeriesSingleVideoWithoutData extends Component {
     return (
       <div className="background--light-primary">
         <SingleVideoPlayer ooyalaId={currentSermon.content.ooyalaId} />
-        <div
-          className="soft-sides background--light-secondary text-dark-secondary"
-          style={{ paddingTop: "15px", paddingBottom: "15px" }}
-          onClick={this.playAudio}
-        >
-          <h7 style={{ verticalAlign: "middle" }}>Listen To Audio</h7>
-          <i
-            className="icon-category-audio float-right"
-            style={{ marginTop: "-2px" }}
-          />
-        </div>
+        {currentSermon.content.audio.length > 0 && (
+          <div
+            className="soft-sides background--light-secondary text-dark-secondary"
+            style={{ paddingTop: "15px", paddingBottom: "15px" }}
+            onClick={this.playAudio}
+          >
+            <h7 style={{ verticalAlign: "middle" }}>Listen To Audio</h7>
+            <i
+              className="icon-category-audio float-right"
+              style={{ marginTop: "-2px" }}
+            />
+          </div>
+        )}
         <div className="soft soft-double@palm-wide-and-up push-top">
           <h2 className="push-half-bottom">{currentSermon.title}</h2>
           <h4>{contentHelpers.speakers(currentSermon)}</h4>
diff --git a/imports/util/content/__tests__/content.speakers.js b/imports/util/content/__tests__/content.speakers.js
index 7d8f46aa1..86613f613 100644
--- a/imports/util/content/__tests__/content.speakers.js
+++ b/imports/util/content/__tests__/content.speakers.js
@@ -18,10 +18,22 @@ it("returns single speaker with no comma captilized", () => {
   expect(result).toBe("Jim Bob");
 });
 
-it("returns mutliple speakers comman separated and captilized", () => {
+it("returns mutliple speakers comma separated and captilized", () => {
   const result = speakers({
     content: {
-      speaker: "jim bob,jimmy jam,jolly jake",
+      speaker: "jim bob, jimmy jam, jolly jake",
+    },
+  });
+  expect(result).toBe("Jim Bob, Jimmy Jam, Jolly Jake");
+});
+it("returns mutliple speakers not csv comma separated and captilized", () => {
+  const result = speakers({
+    content: {
+      speaker: `
+        jim bob
+        jimmy jam
+        jolly jake
+      `,
     },
   });
   expect(result).toBe("Jim Bob, Jimmy Jam, Jolly Jake");
diff --git a/imports/util/content/content.speakers.js b/imports/util/content/content.speakers.js
index c8d8c31fe..05925874e 100644
--- a/imports/util/content/content.speakers.js
+++ b/imports/util/content/content.speakers.js
@@ -1,9 +1,15 @@
 
 function speakers(contentItem) {
-  const contentSpeakers = contentItem.content.speaker.split(",");
+  let contentSpeakers = [];
 
-  return contentSpeakers.map((speaker) => {
-    const words = speaker.split(" ");
+  if (contentItem.content.speaker.indexOf(",") > -1) {
+    contentSpeakers = contentItem.content.speaker.split(",");
+  } else {
+    contentSpeakers = contentItem.content.speaker.split("\n");
+  }
+
+  return contentSpeakers.filter((x) => x.trim()).map((speaker) => {
+    const words = speaker.trim().split(" ");
     return words.map((word) => (
       word.charAt(0).toUpperCase() +
         word.substr(1, word.length - 1)
diff --git a/mobile-config.js b/mobile-config.js
index 53dc22a43..aa07119dc 100644
--- a/mobile-config.js
+++ b/mobile-config.js
@@ -5,8 +5,8 @@ App.info({
   author: "NewSpring Church",
   email: "web@newspring.cc",
   website: "https://newspring.cc",
-  version: "5.0.12",
-  buildNumber: "187",
+  version: "5.0.13",
+  buildNumber: "188",
 });
 
 App.icons({