Merge branch 'master' into webpack-2

quran · Jan 20, 2017 · 6ab9ddb · 6ab9ddb
2 parents ef8a5e5 + 0b8d0f7
commit 6ab9ddb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/components/Line/index.js b/src/components/Line/index.js
@@ -20,15 +20,18 @@ export default class Line extends React.Component {
     isPlaying: PropTypes.bool
   };
 
-  shouldComponentUpdate(nextProps) {
-    const conditions = [
-      this.props.currentAyah !== nextProps.currentAyah,
-      this.props.line !== nextProps.line,
-      this.props.isPlaying !== nextProps.isPlaying
-    ];
-
-    return conditions.some(condition => condition);
-  }
+  // NOTE: this is commented out as it caused problems with 55:31 with missing text.
+  // shouldComponentUpdate(nextProps) {
+  //   const conditions = [
+  //     this.props.currentAyah !== nextProps.currentAyah,
+  //     this.props.line !== nextProps.line,
+  //     this.props.isPlaying !== nextProps.isPlaying
+  //   ];
+  //
+  //   console.log(conditions, conditions.some(condition => condition));
+  //
+  //   return conditions.some(condition => condition);
+  // }
 
   renderText() {
     const { tooltip, currentAyah, audioActions, isPlaying, line } = this.props;

diff --git a/src/components/Word/index.js b/src/components/Word/index.js
@@ -52,7 +52,7 @@ export default class Word extends React.Component {
     const className = `${word.className} ${highlight} ${word.highlight ? word.highlight : ''}`;
 
     if (word.charTypeId === CHAR_TYPE_WORD) {
-      id = `word-${word.ayahKey.replace(/:/, '-')}-${audioPosition}`;
+      id = `word-${word.ayahKey.replace(/:/, '-')}-${audioPosition || word.position}`;
     }
 
     return (

diff --git a/src/config.js b/src/config.js
@@ -84,13 +84,12 @@ const config = {
         { rel: 'apple-touch-icon', sizes: '152x152', href: '/apple-touch-icon-152x152.png' },
         { rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon-180x180.png' },
         { rel: 'preconnect', href: 'https://quran-1f14.kxcdn.com', crossOrigin: '' },
-        { rel: 'preconnect', href: 'https://assets-1f14.kxcdn.com', crossOrigin: '' },
-        { rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css' }
+        { rel: 'preconnect', href: 'https://assets-1f14.kxcdn.com', crossOrigin: '' }
       ],
       /* SEO: https://developers.google.com/structured-data/slsb-overview#markup_examples */
       /* SEO: https://developers.google.com/structured-data/site-name#markup_requirements */
       script: [
-        { src: 'https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en' },
+        { src: 'https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en', async: '', defer: '' },
         {
           type: 'application/ld+json',
           innerHTML: `{

diff --git a/src/helpers/Html.js b/src/helpers/Html.js
@@ -79,6 +79,9 @@ const Html = ({ store, component, assets }) => {
         {Object.keys(assets.javascript).map((script, i) =>
           <script src={assets.javascript[script]} key={i} />
         )}
+        {
+          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" />
+        }
       </body>
     </html>
   );

diff --git a/src/styles/variables.scss b/src/styles/variables.scss
@@ -61,7 +61,6 @@ $tracker-height-hundred-boolean: false;
 
 $font-family-sans-serif: 'Montserrat', sans-serif;
 $font-montserrat: $font-family-sans-serif;
-$font-awesome: 'FontAwesome', serif;
 $icon-font-path: "bootstrap-sass/assets/fonts";
 
 @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";