Fix surah repeat

islamic-network · May 23, 2021 · 502140c · 502140c
1 parent 59c352d
commit 502140c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/html/public/js/jquery.mediaplayer.js b/html/public/js/jquery.mediaplayer.js
@@ -50,7 +50,6 @@ jQuery( document ).ready( function( $ ) {
                         if (w.surah !=9 && w.surah != 1) {
                           number = 1;
                         }
-                        console.log('hello');
                         // Update UI
                         //$('.displayedSurah' + w.surah).removeClass('hide').siblings().addClass('hide');
                         $('#surahSelector').val(w.surah).trigger('change');
@@ -64,6 +63,7 @@ jQuery( document ).ready( function( $ ) {
                             w.realNumber = number;
                         }
                     }
+                    w.highlightActive(number);
                 } else if (w.mode == 'ayah') {
                     // Don't change the number.
                 } else { // w.mode == 'surah'
@@ -74,14 +74,11 @@ jQuery( document ).ready( function( $ ) {
                     } else if (number == w.lastAyah) {
                         number = 1;
                     }
+                    if (w.surah > 1 && number > 1) {
+                        w.highlightActive(number);
+                    }
                 }
-                // console.log(number);
-                var ayah = $('.ayahAudio' + number);
-                ayah.addClass('ayah-playing');
-                w.container.animate({
-                    scrollTop: (ayah.offset().top - 100), scrollLeft: 0
-                },
-                    777);
+                // console.log(number, w.surah);
                 $('#activeAyah').attr('src', 'https://cdn.islamic.network/quran/audio/128/ar.alafasy/' + number + '.mp3');
                 if (w.player.paused) {
                     w.player.load();
@@ -109,6 +106,15 @@ jQuery( document ).ready( function( $ ) {
                 }
             });
         },
+        highlightActive: function(number) {
+            var w = this;
+            var ayah = $('.ayahAudio' + number);
+            ayah.addClass('ayah-playing');
+            w.container.animate({
+                scrollTop: (ayah.offset().top - 100), scrollLeft: 0
+            },
+                777);
+        },
         zoomIntoThisAyah: function() {
             $('.zoomIntoThisAyah').on('click', function() {
                 number = $(this).data('number');

diff --git a/views/ayah.php b/views/ayah.php
@@ -100,7 +100,7 @@
 </div>
 
 <script src="/public/js/jquery.ayah.js?v=1"></script>
-<script src="/public/js/jquery.mediaplayer.js?v=9"></script>
+<script src="/public/js/jquery.mediaplayer.js?v=10"></script>
 <script>
 $(function() {
 	$('#editionSelector').multiselect({ enableFiltering: true, enableCaseInsensitiveFiltering: true, dropUp: true, maxHeight: 400  });

diff --git a/views/quran.php b/views/quran.php
@@ -80,7 +80,7 @@
 </div>
 </div>
 </div>
-<script src="/public/js/jquery.mediaplayer.js?v=9"></script>
+<script src="/public/js/jquery.mediaplayer.js?v=10"></script>
 <script src="/public/js/jquery.quran.js?v=1"></script>
 <script>
     var quran = <?php echo json_encode($quran->data); ?>;

diff --git a/views/surah.php b/views/surah.php
@@ -79,7 +79,7 @@
 	</div>
 	<hr />
 </div>
-<script src="/public/js/jquery.mediaplayer.js?v=9"></script>
+<script src="/public/js/jquery.mediaplayer.js?v=10"></script>
 <script src="/public/js/jquery.surah.js?v=7"></script>
 
 <script>