From d2ceff85b43964b6c0a9f26f877afa508a42e91e Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Sun, 9 Apr 2017 17:31:40 -0700 Subject: [PATCH 1/4] Fix search --- src/containers/Search/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/containers/Search/index.js b/src/containers/Search/index.js index c83efa6a7..16ce18edb 100644 --- a/src/containers/Search/index.js +++ b/src/containers/Search/index.js @@ -130,6 +130,7 @@ class Search extends Component { match={entities[result].match} key={entities[result].verseKey} tooltip={options.tooltip} + userAgent={options.userAgent} isSearched /> )); From 6f701b3e9124c072e4f0fba87f51f0eb7b21e165 Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Sun, 9 Apr 2017 17:48:59 -0700 Subject: [PATCH 2/4] Fixes #727 highlight word by word --- src/components/Audioplayer/index.js | 9 ++++----- src/components/Verse/index.js | 2 +- src/components/Word/index.js | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js index a12dccf51..564747f3b 100644 --- a/src/components/Audioplayer/index.js +++ b/src/components/Audioplayer/index.js @@ -384,7 +384,6 @@ export class Audioplayer extends Component { duration, chapter, isPlaying, - isLoadedOnClient, repeat, // eslint-disable-line no-shadow shouldScroll, // eslint-disable-line no-shadow setRepeat // eslint-disable-line no-shadow @@ -406,15 +405,15 @@ export class Audioplayer extends Component { return (
- {isLoadedOnClient ? + { + currentFile && : null} + /> + } { - isLoadedOnClient && segments && - segments[currentVerse] && segments[currentVerse] && diff --git a/src/components/Word/index.js b/src/components/Word/index.js index 2c496209f..392d0e2f4 100644 --- a/src/components/Word/index.js +++ b/src/components/Word/index.js @@ -57,7 +57,7 @@ class Word extends Component { let spacer; const highlight = currentVerse === word.verseKey && isPlaying ? 'highlight' : ''; const className = `${useTextFont ? 'text-' : ''}${word.charType === CHAR_TYPE_WORD ? word.className : 'p0'} ${word.charType} ${highlight} ${word.highlight ? word.highlight : ''}`; - const id = `word-${word.verseKey.replace(/:/, '-')}-${audioPosition || word.position}`; + const id = `word-${word.verseKey.replace(/:/, '-')}-${audioPosition}`; if (word.charType === CHAR_TYPE_END) { text = zeroPad(word.verseKey.split(':')[1], 3, 0); From 7efe1dc5b4b16c8e24061720a4fc3aba66b19616 Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Sun, 9 Apr 2017 18:04:39 -0700 Subject: [PATCH 3/4] Fixes #728 --- src/components/Audioplayer/Segments/index.js | 1 - src/components/Audioplayer/index.js | 4 ++-- src/components/ContentDropdown/index.js | 4 ++-- src/components/ReciterDropdown/index.js | 6 ++++-- src/components/Verse/index.js | 1 - src/components/Verse/style.scss | 6 +++--- src/components/Word/index.js | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/Audioplayer/Segments/index.js b/src/components/Audioplayer/Segments/index.js index 90b210a48..80a4c0139 100644 --- a/src/components/Audioplayer/Segments/index.js +++ b/src/components/Audioplayer/Segments/index.js @@ -4,7 +4,6 @@ import Helmet from 'react-helmet'; import debug from 'helpers/debug'; class Segments extends Component { - shouldComponentUpdate(nextProps) { return [ this.props.currentVerse !== nextProps.currentVerse, diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js index 564747f3b..cfac5abd2 100644 --- a/src/components/Audioplayer/index.js +++ b/src/components/Audioplayer/index.js @@ -52,8 +52,8 @@ export class Audioplayer extends Component { return false; } - // When you go directly to the chapter page, /2, the files are not loaded yet - if (this.props.isLoadedOnClient !== nextProps.isLoadedOnClient) { + // First load + if (this.props.currentFile !== nextProps.currentFile) { return this.handleAddFileListeners(nextProps.currentFile); } diff --git a/src/components/ContentDropdown/index.js b/src/components/ContentDropdown/index.js index a90d8ab63..04472f855 100644 --- a/src/components/ContentDropdown/index.js +++ b/src/components/ContentDropdown/index.js @@ -64,10 +64,10 @@ class ContentDropdown extends Component { this.handleOptionSelected(translation.id)} > - {render(translation)} + {render(translation)} ); diff --git a/src/components/ReciterDropdown/index.js b/src/components/ReciterDropdown/index.js index 31cd3163a..b6e407407 100644 --- a/src/components/ReciterDropdown/index.js +++ b/src/components/ReciterDropdown/index.js @@ -27,11 +27,13 @@ class ReciterDropdown extends Component { > onOptionChange({ audio: slug.id })} > - {slug.reciterNameEng} {slug.style ? `(${slug.style})` : ''} + + {slug.reciterNameEng} {slug.style ? `(${slug.style})` : ''} + )); diff --git a/src/components/Verse/index.js b/src/components/Verse/index.js index dcf38609e..72f82476c 100644 --- a/src/components/Verse/index.js +++ b/src/components/Verse/index.js @@ -24,7 +24,6 @@ const Share = Loadable({ }); class Verse extends Component { - // TODO: Should this belong here? componentDidMount() { const { verse, audio } = this.props; diff --git a/src/components/Verse/style.scss b/src/components/Verse/style.scss index 1db6feccd..46fcad6c4 100644 --- a/src/components/Verse/style.scss +++ b/src/components/Verse/style.scss @@ -29,9 +29,10 @@ display: block; text-decoration: none; font-size: 12px; + cursor: pointer; - &:hover{ - cursor: pointer; + &:focus{ + color: $text-muted; } } .label{ @@ -142,4 +143,3 @@ width: 100%; margin: 0px auto; } - diff --git a/src/components/Word/index.js b/src/components/Word/index.js index 392d0e2f4..79785b7b3 100644 --- a/src/components/Word/index.js +++ b/src/components/Word/index.js @@ -10,7 +10,6 @@ const CHAR_TYPE_RUB = 'rub'; const CHAR_TYPE_SAJDAH = 'sajdah'; class Word extends Component { - buildTooltip = (word, tooltip) => { let title; From 9a36ff7ceca10ca0cace6c8da193a7412e76219b Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Sun, 9 Apr 2017 18:12:38 -0700 Subject: [PATCH 4/4] ontop of master --- src/components/Verse/index.js | 2 +- src/components/Word/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Verse/index.js b/src/components/Verse/index.js index 72f82476c..d68af8483 100644 --- a/src/components/Verse/index.js +++ b/src/components/Verse/index.js @@ -315,7 +315,7 @@ Verse.propTypes = { currentWord: PropTypes.number, // gets passed in an integer, null by default iscurrentVerse: PropTypes.bool, currentVerse: PropTypes.string, - userAgent: PropTypes.func, + userAgent: PropTypes.object, // eslint-disable-line audio: PropTypes.number.isRequired, loadAudio: PropTypes.func.isRequired }; diff --git a/src/components/Word/index.js b/src/components/Word/index.js index 79785b7b3..3d501631d 100644 --- a/src/components/Word/index.js +++ b/src/components/Word/index.js @@ -93,7 +93,7 @@ Word.propTypes = { tooltip: PropTypes.string, audioActions: PropTypes.object.isRequired, // eslint-disable-line audioPosition: PropTypes.number, - currentVerse: PropTypes.string.isRequired, + currentVerse: PropTypes.string, isPlaying: PropTypes.bool, isSearched: PropTypes.bool, useTextFont: PropTypes.bool // tmp change to compare text and code based rendering