Do not display video time instances that have deletion in progress

bdecentgmbh · Mar 27, 2020 · 41ae0bf · 41ae0bf
1 parent 4c40f1d
commit 41ae0bf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/amd/build/player.min.js.map b/amd/build/player.min.js.map
diff --git a/amd/build/videotime.min.js.map b/amd/build/videotime.min.js.map
diff --git a/amd/src/videotime.js b/amd/src/videotime.js
@@ -13,6 +13,12 @@ define(['jquery', 'mod_videotime/player', 'core/ajax', 'core/log', 'core/templat
 
             log.debug('VIDEO_TIME embed options', embedOptions);
 
+            // Check if Vimeo video element exists.
+            if ($('#vimeo-embed-' + cmid).length == 0) {
+                log.debug("Vimeo video element not found: #vimeo-embed-" + cmid);
+                return;
+            }
+
             var player = new Vimeo('vimeo-embed-' + cmid, embedOptions);
 
             if (hasPro) {

diff --git a/lib.php b/lib.php
@@ -516,7 +516,7 @@ function videotime_cm_info_dynamic(cm_info $cm) {
         return;
     }
 
-    if (!videotime_has_pro()) {
+    if (!videotime_has_pro() || $cm->deletioninprogress || !$cm->visible) {
         return;
     }
 

diff --git a/version.php b/version.php
@@ -26,6 +26,6 @@
 
 $plugin->component = 'mod_videotime';
 $plugin->release = '1.2';
-$plugin->version = 2019111200;
+$plugin->version = 2020032600;
 $plugin->requires = 2015111610;
 $plugin->maturity = MATURITY_STABLE;