Update #86by49k6p - canvas.js updated to include spectrum.js from amd

Lesterhuis-Training-en-Consultancy · Sep 10, 2024 · a13a4db · a13a4db
1 parent 44d4737
commit a13a4db
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 30 deletions.
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/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>