Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024070900 release code #7

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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. -->
11 changes: 7 additions & 4 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
674 changes: 0 additions & 674 deletions LICENSE

This file was deleted.

9 changes: 0 additions & 9 deletions amd/build/panopto.min.js

This file was deleted.

1 change: 0 additions & 1 deletion amd/build/panopto.min.js.map

This file was deleted.

21 changes: 15 additions & 6 deletions js/panopto_tinymce_panoptoltibutton.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -185,7 +193,7 @@ var panopto_tinymce_panoptoltibutton = {
textHeight: textHeight,
titleHeight: titleHeight,
titleWidth: titleWidth,
thumbnailId: thumbnailId
thumbnailId: thumbnailId,
});
break;
default:
Expand All @@ -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;
}

Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions lang/en/tiny_panoptoltibutton.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading