5.2.7: Fix TypeError when translation is undefined

moefront · Sep 2, 2017 · 6565b0c · 6565b0c
1 parent 86eb8a7
commit 6565b0c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 34 deletions.
diff --git a/dist/assets/muse-player-react-lite.js b/dist/assets/muse-player-react-lite.js
diff --git a/dist/assets/muse-player.js b/dist/assets/muse-player.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "muse-player",
-  "version": "5.2.6",
+  "version": "5.2.7",
   "description": "Just a simple and dilligent HTML5 Audio Player written in React.",
   "main": "dist/assets/muse-player.js",
   "scripts": {

diff --git a/src/config/base.js b/src/config/base.js
@@ -2,5 +2,5 @@
 
 // Settings configured here will be merged into the final config object.
 export default {
-	MUSE_VERSION: '5.2.6'
+	MUSE_VERSION: '5.2.7'
 }
diff --git a/src/utils/lyricParser.js b/src/utils/lyricParser.js
@@ -26,7 +26,11 @@ export const lyricParser = (rawLyric, rawTranslation) => {
   if (!raw || typeof raw != 'string') {
     return false;
   }
-  if (rawTranslation.match(/\[(\d{1,2}):(\d|[0-5]\d)(\.\d+)?\]/)) {
+
+  if (
+    rawTranslation &&
+    rawTranslation.match(/\[(\d{1,2}):(\d|[0-5]\d)(\.\d+)?\]/)
+  ) {
     transVersion = 1;
   }
   // simplified version of lyric: [time1][time2]lyric
@@ -83,38 +87,39 @@ export const lyricParser = (rawLyric, rawTranslation) => {
   });
 
   /* Translation parse block */
-  rawTranslation = rawTranslation.replace(/\\n/g, '\n').replace(/\\r/g, '\r');
-
-  lines = String(rawTranslation).split('\n');
-  lines.forEach(index => {
-    if (index.match(/\[ti:|ar:|al:\.*]/g)) return;
-
-    // translation author
-    if (index.match(/\[by:(.*)\]/g)) {
-      res.transAuthor = /\[by:(.*)\]/g.exec(index)[1];
-      return;
-    }
+  if (rawTranslation) {
+    rawTranslation = rawTranslation.replace(/\\n/g, '\n').replace(/\\r/g, '\r');
+
+    lines = String(rawTranslation).split('\n');
+    lines.forEach(index => {
+      if (index.match(/\[ti:|ar:|al:\.*]/g)) return;
+
+      // translation author
+      if (index.match(/\[by:(.*)\]/g)) {
+        res.transAuthor = /\[by:(.*)\]/g.exec(index)[1];
+        return;
+      }
+
+      switch (transVersion) {
+        // lines
+        case 0:
+          transArr.push(index);
+          break;
 
-    switch (transVersion) {
-      // lines
-      case 0:
-        transArr.push(index);
-        break;
+        // simplified
+        case 1:
+          if (!index) break;
 
-      // simplified
-      case 1:
-        if (!index)
+          const match = /\[(\d{1,2}):(\d|[0-5]\d)(\.\d+)?\](.*)/g.exec(index),
+            timeline = calcTime(match);
+          transArr.push({
+            timeline: timeline,
+            text: match[4]
+          });
           break;
-
-        const match = /\[(\d{1,2}):(\d|[0-5]\d)(\.\d+)?\](.*)/g.exec(index),
-        timeline = calcTime(match);
-        transArr.push({
-          timeline: timeline,
-          text: match[4]
-        });
-        break;
-    }
-  });
+      }
+    });
+  }
 
   // sort lyrics
   const cmp = (a, b) => a.timeline - b.timeline;