Merge pull request ncstate-delta#701 from jrchamp/fix/esm-format

js: Use ESM format for form.js

Author: smbader

amd/build/form.min.js

@@ -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.

amd/build/form.min.js.map

@@ -29,7 +29,7 @@
         "handlers" => [
             'zoommeetingdetails' => [
                 'displaydata' => [
-                'title' => 'pluginname',
+                    'title' => 'pluginname',
                     'icon' => $CFG->wwwroot . '/mod/zoom/pix/icon.gif',
                     'class' => '',
                 ],

amd/src/form.js

@@ -654,27 +654,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);
@@ -877,14 +877,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);

classes/webservice.php

@@ -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}}">

db/mobile.php

@@ -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}}">