Skip to content

js: Use ESM format for form.js #701

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.

Sign up for GitHub

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

Merged
smbader merged 4 commits into from
Apr 2, 2026
Merged

js: Use ESM format for form.js #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fb68d1
js: ESM format for form.js
jrchamp Feb 16, 2026
20cceda
templates: add tab support for bootstrap 5
jrchamp Feb 16, 2026
6972df1
phpcs: fix indentation
jrchamp Feb 16, 2026
afdf21b
mod_form: only check $recordingsettings if it might be set
jrchamp Feb 16, 2026
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
16 changes: 8 additions & 8 deletions amd/build/form.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion amd/build/form.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

687 changes: 340 additions & 347 deletions amd/src/form.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion classes/webservice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public function get_account_meeting_security_settings($userid) {

// Set a default meeting password requirment if it is not present.
if (!isset($meetingsecurity->meeting_password_requirement)) {
$meetingsecurity->meeting_password_requirement = (object) self::DEFAULT_MEETING_PASSWORD_REQUIREMENT;
$meetingsecurity->meeting_password_requirement = (object) self::DEFAULT_MEETING_PASSWORD_REQUIREMENT;
}

// Set a default encryption setting if it is not present.
Expand Down
2 changes: 1 addition & 1 deletion db/mobile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"handlers" => [
'zoommeetingdetails' => [
'displaydata' => [
'title' => 'pluginname',
'title' => 'pluginname',
'icon' => $CFG->wwwroot . '/mod/zoom/pix/icon.gif',
'class' => '',
],
Expand Down
34 changes: 17 additions & 17 deletions mod_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,27 +652,27 @@ public function definition() {
// Add autorecording option if enabled.
$allowrecordingchangeoption = $config->allowrecordingchangeoption;
if ($allowrecordingchangeoption) {
$defaultsetting = $config->recordingoption;

// Add auto recording options according to user settings.
$options = [
ZOOM_AUTORECORDING_NONE => get_string('autorecording_none', 'mod_zoom'),
];

if (!empty($hostuserid)) {
$recordingsettings = zoom_get_user_settings($hostuserid)->recording;
}

if (!empty($recordingsettings->local_recording)) {
$options[ZOOM_AUTORECORDING_LOCAL] = get_string('autorecording_local', 'mod_zoom');
}
if ($config->recordingoption === ZOOM_AUTORECORDING_USERDEFAULT) {
$defaultsetting = $recordingsettings->auto_recording;
}

if (!empty($recordingsettings->cloud_recording)) {
$options[ZOOM_AUTORECORDING_CLOUD] = get_string('autorecording_cloud', 'mod_zoom');
}
if (!empty($recordingsettings->local_recording)) {
$options[ZOOM_AUTORECORDING_LOCAL] = get_string('autorecording_local', 'mod_zoom');
}

if ($config->recordingoption === ZOOM_AUTORECORDING_USERDEFAULT) {
$defaultsetting = $recordingsettings->auto_recording;
} else {
$defaultsetting = $config->recordingoption;
if (!empty($recordingsettings->cloud_recording)) {
$options[ZOOM_AUTORECORDING_CLOUD] = get_string('autorecording_cloud', 'mod_zoom');
}
}

$mform->addElement('select', 'option_auto_recording', get_string('option_auto_recording', 'mod_zoom'), $options);
Expand Down Expand Up @@ -875,14 +875,14 @@ public function definition_after_data() {

if ($zoomuserid !== false) {
$recordingsettings = zoom_get_user_settings($zoomuserid)->recording;
}

if (!empty($recordingsettings->local_recording)) {
$options[ZOOM_AUTORECORDING_LOCAL] = get_string('autorecording_local', 'mod_zoom');
}
if (!empty($recordingsettings->local_recording)) {
$options[ZOOM_AUTORECORDING_LOCAL] = get_string('autorecording_local', 'mod_zoom');
}

if (!empty($recordingsettings->cloud_recording)) {
$options[ZOOM_AUTORECORDING_CLOUD] = get_string('autorecording_cloud', 'mod_zoom');
if (!empty($recordingsettings->cloud_recording)) {
$options[ZOOM_AUTORECORDING_CLOUD] = get_string('autorecording_cloud', 'mod_zoom');
}
}

$recordingelement->load($options);
Expand Down
2 changes: 1 addition & 1 deletion templates/breakoutrooms_room_datatoclone.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<div id="data-to-clone" class="hidden">
<ul id="rooms-list-item" role="tablist">
<li class="nav-item">
<a class="nav-link" href="" data-toggle="tab" role="tab">
<a class="nav-link" href="" data-bs-toggle="tab" data-toggle="tab" role="tab">
<span class="tab-name"></span>
</a>
<button type="button" class="pull-right delete-room" title="{{#str}} deleteroom, zoom {{/str}}">
Expand Down
2 changes: 1 addition & 1 deletion templates/breakoutrooms_rooms.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<ul class="nav nav-pills flex-column" role="tablist">
{{#rooms}}
<li id="tab-{{roomid}}" class="nav-item">
<a class="nav-link {{#roomactive}}active{{/roomactive}}" href="#link{{roomid}}" data-toggle="tab" role="tab">
<a class="nav-link {{#roomactive}}active{{/roomactive}}" href="#link{{roomid}}" data-bs-toggle="tab" data-toggle="tab" role="tab">
<span class="tab-name">{{roomname}}</span>
</a>
<button type="button" class="pull-right delete-room" title="{{#str}} deleteroom, zoom {{/str}}">
Expand Down