Merge pull request #20 from Lesterhuis-Training-en-Consultancy/86by49…

…k6p-upgrade-moodle45 86by49k6p upgrade moodle45
Lesterhuis-Training-en-Consultancy · Nov 20, 2024 · 7a904b7 · 7a904b7
2 parents 44d4737 + bd78e85
commit 7a904b7
Show file tree

Hide file tree

Showing 11 changed files with 1,687 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,9 @@ Types of changes
 * **Fixed** for any bug fixes.
 * **Security** in case of vulnerabilities.
 
+## Version (4.5.0) - 2024-09-10
+- Upgraded and refactored for Moodle 4.5
+
 ## Version (4.4.0) - 2024-04-05
 - Upgraded and refactored for Moodle 4.4
 

diff --git a/README.md b/README.md
@@ -10,14 +10,15 @@ Special thanks to Gemma Lesterhuis ([Lesterhuis Training & Consultancy](https://
 * Author: Luuk Verhoeven, [ldesignmedia.nl](https://ldesignmedia.nl/)
 * Author: Gemma Lesterhuis, [Lesterhuis Training & Consultancy](https://ltnc.nl/)
 * Min. required: Moodle 3.9.x
-* Max. Required: Moodle 4.1.x
+* Max. Required: Moodle 4.5.x
 * Supports PHP: 7.4 - 8.1
 
 ![Moodle39](https://img.shields.io/badge/moodle-3.9-brightgreen.svg)
 ![Moodle310](https://img.shields.io/badge/moodle-3.10-brightgreen.svg)
 ![Moodle402](https://img.shields.io/badge/moodle-4.2-brightgreen.svg)
 ![Moodle403](https://img.shields.io/badge/moodle-4.3-brightgreen.svg)
 ![Moodle404](https://img.shields.io/badge/moodle-4.4-brightgreen.svg)
+![Moodle405](https://img.shields.io/badge/moodle-4.5-brightgreen.svg)
 
 ![PHP7.4](https://img.shields.io/badge/PHP-7.2-blue.svg)
 ![PHP8.0](https://img.shields.io/badge/PHP-8.0-blue.svg)

diff --git a/amd/build/canvas.min.js b/amd/build/canvas.min.js
diff --git a/amd/build/canvas.min.js.map b/amd/build/canvas.min.js.map
diff --git a/amd/build/spectrum.min.js b/amd/build/spectrum.min.js
diff --git a/amd/build/spectrum.min.js.map b/amd/build/spectrum.min.js.map
diff --git a/amd/src/canvas.js b/amd/src/canvas.js
@@ -25,7 +25,7 @@
  **/
 /* global fabric */
 /* eslint no-unused-expressions: "off", no-console:off, no-invalid-this:"off",no-script-url:"off", block-scoped-var: "off" */
-define(['jquery', 'core/notification'], function($, notification) {
+define(['jquery', 'core/notification', 'mod_gcanvas/spectrum'], function ($, notification) {
     'use strict';
 
     /**
@@ -978,27 +978,18 @@ define(['jquery', 'core/notification'], function($, notification) {
          * Init
          * @param {object} args
          */
-        initialise: function(args) {
+        initialise: function (args) {
 
-            // Load spectrum javascript form here.
-            $.getScript(M.cfg.wwwroot + "/mod/gcanvas/javascript/spectrum.js").done(function() {
+            // Load the args passed from PHP.
+            setOptions(args);
 
-                // Load the args passed from PHP.
-                setOptions(args);
+            // Set internal debug console.
+            setDebug(opts.debugjs);
 
-                // Set internal debug console.
-                setDebug(opts.debugjs);
-
-                $.noConflict();
-                $(document).ready(function() {
-                    debug.log('Canvas Module v1.2');
-                    canvasModule.init();
-                });
-            }).fail(function(jqxhr, settings, exception) {
-                // Display loading issue in console.
-                debug.log(jqxhr);
-                debug.log(settings);
-                debug.log(exception);
+            $.noConflict();
+            $(document).ready(function () {
+                debug.log('Canvas Module v1.2');
+                canvasModule.init();
             });
         }
     };

diff --git a/amd/src/spectrum.js b/amd/src/spectrum.js
diff --git a/javascript/spectrum.js b/javascript/spectrum.js
diff --git a/thirdpartylibs.xml b/thirdpartylibs.xml
@@ -7,13 +7,6 @@
         <license>MIT</license>
         <licenseversion></licenseversion>
     </library>
-    <library>
-        <location>javascript/spectrum.js</location>
-        <name>spectrum.js</name>
-        <version>1.8.0</version>
-        <license>MIT</license>
-        <licenseversion></licenseversion>
-    </library>
     <library>
         <location>css/spectrum.css</location>
         <name>spectrum.css</name>
@@ -28,4 +21,4 @@
         <license>Graphics licensed under CC-BY</license>
         <licenseversion>4.0</licenseversion>
     </library>
-</libraries>
+</libraries>
diff --git a/version.php b/version.php
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_gcanvas';
-$plugin->release = '4.4.1';
-$plugin->version = 2024051000;
+$plugin->release = '4.5.0';
+$plugin->version = 2024091000;
 $plugin->requires = 2020061500;
-$plugin->supported = [39, 404];
+$plugin->supported = [39, 405];
 $plugin->maturity = MATURITY_STABLE;