Merge pull request #66 from catalyst/stable-catalyst-fix-resize-rebase

adding control and height for proper display of control panel fix #49

Author: marcusboon

amd/build/embed.min.js

@@ -22,6 +22,13 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
                 var resizeDelay;
                 var instance = H5P.instances[0];
                 var parentIsFriendly = false;
+                var completionheight = 0;
+                if (globalThis.completion) {
+                    var completionactivity = document.getElementsByClassName('activity-header')[0];
+                    var completionmargin = document.defaultView.getComputedStyle(completionactivity, '')
+                        .getPropertyValue('margin-bottom');
+                    completionheight = completionactivity.scrollHeight + parseInt(completionmargin, 10); // We want the first element.
+                }
 
                 // Handle that the resizer is loaded after the iframe.
                 H5PEmbedCommunicator.on('ready', function() {
@@ -41,11 +48,10 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
                     // Content need to be resized to fit the new iframe size.
                     H5P.trigger(instance, 'resize');
                 });
-
                 // When resize has been prepared tell parent window to resize.
                 H5PEmbedCommunicator.on('resizePrepared', function() {
                     H5PEmbedCommunicator.send('resize', {
-                        scrollHeight: iFrame.contentDocument.body.scrollHeight
+                        scrollHeight: iFrame.contentDocument.body.scrollHeight + ((globalThis.completion) ? completionheight : 0)
                     });
                 });
 
@@ -66,7 +72,7 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
                             H5PEmbedCommunicator.send('prepareResize',
                                 {
                                     scrollHeight: iFrame.contentDocument.body.scrollHeight,
-                                    clientHeight: iFrame.contentDocument.body.clientHeight
+                                    clientHeight: iFrame.contentDocument.body.clientHeight + ((globalThis.completion) ? completionheight : 0)
                                 }
                             );
                         } else {
@@ -93,5 +99,13 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
             }
         });
     });
-
-});
+    return  /** @alias module:mod_hvp/embed */ {
+        /**
+         * Initialise embed instance.
+         * @param {boolean} completion a boolean about displaying the completion information
+         */
+        init: function (completion) {
+            globalThis.completion = completion;
+        },
+    };
+});

amd/build/embed.min.js.map

@@ -82,6 +82,17 @@
 // Release session while loading the rest of our assets.
 core\session\manager::write_close();
 
+// Verify is the completion information is being displayed.
+$completiondisplay = false;
+if ($cm->completion != 0) {
+    $completiondisplay = true;
+}
+
+// If there is intro for the activity, we will add height for the embed.
+if (!empty($content['intro'])) {
+    $completiondisplay = true;
+}
+
 // Configure page.
 $PAGE->set_url(new \moodle_url('/mod/hvp/embed.php', array('id' => $id)));
 $PAGE->set_title(format_string($content['title']));
@@ -96,7 +107,7 @@
 $PAGE->add_body_class('h5p-embed');
 $PAGE->set_pagelayout('embedded');
 $root = \mod_hvp\view_assets::getsiteroot();
-$PAGE->requires->js_call_amd('mod_hvp/embed');
+$PAGE->requires->js_call_amd('mod_hvp/embed', 'init', ['completion' => $completiondisplay]);
 // Add H5P assets to page.
 $view->addassetstopage();
 $view->logviewed();