Merge pull request #37 from justusdieckmann/update/403

Adjust filter to new initPaella function signature from mod_opencast
Opencast-Moodle · Nov 16, 2023 · ca66e20 · ca66e20
2 parents 2864cbe + ddd9123
commit ca66e20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/filter.php b/filter.php
@@ -123,7 +123,8 @@ public function filter($text, array $options = array()) {
                                 // Collect the needed data being submitted to the template.
                                 $mustachedata = new stdClass();
                                 $mustachedata->playerid = 'ocplayer_' . $i++;
-                                $mustachedata->configurl = get_config('filter_opencast', 'configurl_' . $ocinstance->id);
+                                $mustachedata->configurl = (new moodle_url(get_config('filter_opencast', 'configurl_' . $ocinstance->id)))->out(false);
+                                $mustachedata->themeurl = (new moodle_url(get_config('mod_opencast', 'themeurl_' . $ocinstance->id)))->out(false);
                                 if (strpos($mustachedata->configurl, 'http') === false) {
                                     $mustachedata->configurl = (new moodle_url($mustachedata->configurl))->out();
                                 }

diff --git a/templates/player.mustache b/templates/player.mustache
@@ -49,8 +49,9 @@ function init_{{playerid}}() {
     }
     else {
         iframeWindow.MoodlePaellaPlayer.initPaella(
-            '{{configurl}}',
-            JSON.parse('{{data}}'.replaceAll('&quot;', '"'))
+            '{{{configurl}}}',
+            '{{{themeurl}}}',
+            JSON.parse('{{{data}}}')
         );
     }
 }

diff --git a/version.php b/version.php
@@ -31,5 +31,5 @@
 $plugin->maturity = MATURITY_ALPHA;
 $plugin->dependencies = array(
     'tool_opencast' => 2023030100,
-    'mod_opencast' => 2023030100
+    'mod_opencast' => 2023052300
 );