Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

web/assets/js/bs5.timelapseViewer.js

@@ -18,12 +18,10 @@ $(document).ready(function(e){
     var currentPlaylist = {}
     var frameSelected = null
     var playIntervalTimer = null
-    var playInterval = 1000 / 30
     var fieldHolderCssHeightModifier = 0
     var canPlay = false;
     var downloaderIsChecking = false
     var allowKeepChecking = true
-    var selectedFps = 15
     var currentPlaylistArray = []
 
     var openTimelapseWindow = function(monitorId,startDate,endDate){
@@ -132,11 +130,13 @@ $(document).ready(function(e){
                 if(!newSelectedFrame)return
                 frameSelected = newSelectedFrame.filename
                 startPlayLoop()
-            },playInterval)
+            },1000/parseInt(fpsSelector.val(),10))
         })
     }
     var playTimelapse = function(){
+        var playPauseText = timelapseWindow.find('.playPauseText')
         canPlay = true
+        playPauseText.text(lang.Pause)
         startPlayLoop()
     }
     var destroyTimelapse = function(){
@@ -148,20 +148,17 @@ $(document).ready(function(e){
         allowKeepChecking = false
     }
     var pauseTimelapse = function(){
+        var playPauseText = timelapseWindow.find('.playPauseText')
         canPlay = false
+        playPauseText.text(lang.Play)
         clearTimeout(playIntervalTimer)
         playIntervalTimer = null
     }
     var togglePlayPause = function(){
-        var playPauseText = timelapseWindow.find('.playPauseText')
         if(canPlay){
-            canPlay = false
             pauseTimelapse()
-            playPauseText.text(lang.Play)
         }else{
-            canPlay = true
             playTimelapse()
-            playPauseText.text(lang.Pause)
         }
     }
     var iconHtml = function(iconClasses,withSpace){
@@ -271,10 +268,6 @@ $(document).ready(function(e){
             runDownloader()
         }
     })
-    fpsSelector.change(function(ev){
-        playInterval = 1000 / ev.value
-        selectedFps = ev.value + 0
-    })
     function isElementVisible (el) {
       const holder = frameIcons[0]
       const { top, bottom, height } = el.getBoundingClientRect()