Merge pull request #7 from Panopto/ahrnjica/2024070900-release-code

2024070900 release code
Panopto · Jul 9, 2024 · 0ccac61 · 0ccac61
2 parents 97ba504 + de4cebb
commit 0ccac61
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 695 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,9 @@
+## Description
+
+
+## Testing
+<!-- How and what have you tested? What needs later verification? -->
+
+
+## Jira Link
+<!-- E.g. PC-### (link to Jira will populate automatically). Optional and Jira# must still be added to the PR title. -->
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -38,15 +38,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '8.0'
-            moodle-branch: 'master'
-            database: 'pgsql'
           - php: '8.1'
-            moodle-branch: 'MOODLE_401_STABLE'
+            moodle-branch: 'master'
             database: 'pgsql'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_403_STABLE'
+            database: 'mariadb'
           - php: '8.1'
             moodle-branch: 'MOODLE_402_STABLE'
             database: 'pgsql'
+          - php: '8.1'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'mariadb'
 
     steps:
       - name: Check out repository code

diff --git a/LICENSE b/LICENSE
diff --git a/amd/build/panopto.min.js b/amd/build/panopto.min.js
diff --git a/amd/build/panopto.min.js.map b/amd/build/panopto.min.js.map
diff --git a/js/panopto_tinymce_panoptoltibutton.js b/js/panopto_tinymce_panoptoltibutton.js
@@ -37,8 +37,8 @@ var panopto_tinymce_panoptoltibutton = {
             var StrategyClass = panopto_tinymce_panoptoltibutton.EmbeddedContentRenderingStrategy;
 
             if (   item.mediaType === 'application/vnd.ims.lti.v1.ltilink'
-                   || item.mediaType === 'application\\/vnd.ims.lti.v1.ltilink'
-                   || item.placementAdvice) {
+                || item.mediaType === 'application\\/vnd.ims.lti.v1.ltilink'
+                || item.placementAdvice) {
                 StrategyClass = panopto_tinymce_panoptoltibutton.IframeRenderingStrategy;
 
                 if (item.placementAdvice || item.iframe) {
@@ -67,7 +67,13 @@ var panopto_tinymce_panoptoltibutton = {
                 }
             }
 
-            var strategy = new StrategyClass(item, course, resourceLinkId, tool);
+            var strategy = new StrategyClass(
+                item,
+                course,
+                resourceLinkId,
+                tool,
+                wwwroot,
+            );
 
             return strategy;
         };
@@ -165,6 +171,7 @@ var panopto_tinymce_panoptoltibutton = {
                 if (mimeTypePieces[1] === 'vnd.ims.lti.v1.ltilink') {
 
                     content = TEMPLATES.ltiLink({
+                        wwwroot: wwwroot,
                         item: item,
                         toolid: tool.id,
                         resourcelinkid: resourceLinkId,
@@ -177,6 +184,7 @@ var panopto_tinymce_panoptoltibutton = {
                 break;
             case 'text':
                 content = TEMPLATES.link({
+                    wwwroot: wwwroot,
                     item: item,
                     custom: encodeURIComponent(JSON.stringify(item.custom)),
                     course: course,
@@ -185,7 +193,7 @@ var panopto_tinymce_panoptoltibutton = {
                     textHeight: textHeight,
                     titleHeight: titleHeight,
                     titleWidth: titleWidth,
-                    thumbnailId: thumbnailId
+                    thumbnailId: thumbnailId,
                 });
                 break;
             default:
@@ -205,8 +213,8 @@ var panopto_tinymce_panoptoltibutton = {
 
         // If the item URL is the same as the LTI Launch URL (or Content-Item request), we assume we need
         // to make an LTI Launch request.
-        if (item.url !== tool.baseurl && item.url !== tool.config.
-                toolurl_ContentItemSelectionRequest) {
+        if (   item.url !== tool.baseurl
+            && item.url !== tool.config.toolurl_ContentItemSelectionRequest) {
             item.useCustomUrl = true;
         }
 
@@ -230,6 +238,7 @@ var panopto_tinymce_panoptoltibutton = {
 
         this.toHtml = function () {
             return template({
+                wwwroot: wwwroot,
                 item: item,
                 custom: JSON.stringify(item.custom),
                 courseId: course.id,

diff --git a/lang/en/tiny_panoptoltibutton.php b/lang/en/tiny_panoptoltibutton.php
@@ -23,6 +23,7 @@
 
 $string['modal_button_close'] = 'Close';
 $string['pluginname'] = 'Add Panopto Video';
+$string['helplinktext'] = 'PanoptoLTI Button';
 $string['panopto_button_description'] = 'Add Panopto Video';
 $string['panopto_button_long_description'] = 'Add Panopto Video Content to TinyMCE';
 $string['panopto_button_unprovisioned_error'] = 'Error: Please use the Panopto Block to provision this course before using this tool';

diff --git a/version.php b/version.php
@@ -24,7 +24,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // The current plugin version (Date: YYYYMMDDXX).
-$plugin->version = 2024012500;
+$plugin->version = 2024070900;
 
 // Requires this Moodle version - 4.1.0
 $plugin->requires = 2022112800;