@oat-sa/tao-core-ui 1.67.0 → 1.68.0

package/dist/maths/calculator/basicCalculator.js

@@ -20,11 +20,11 @@ define(['lodash', 'ui/maths/calculator/defaultCalculator', 'handlebars', 'lib/ha
       buffer += "</span></button>\n        <button class=\"key command\" data-command=\"historyDown\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.HISTORYDOWN)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
-      buffer += "</span></button>\n        <button class=\"key command\" data-command=\"stepDeleteLeft\"><span>";
+      buffer += "</span></button>\n        <button class=\"key command\" data-command=\"deleteLeft\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.BACKSPACE)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
       buffer += "</span></button>\n        <button class=\"key command\" data-command=\"clear\"><span>";
-      stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.CLEARALL)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
+      stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.RESET)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
       buffer += "</span></button>\n    </div>\n    <div class=\"row\">\n        <button class=\"key operator\" data-command=\"term\" data-param=\"LPAR\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.LPAR)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
@@ -86,7 +86,7 @@ define(['lodash', 'ui/maths/calculator/defaultCalculator', 'handlebars', 'lib/ha
       buffer += "</span></button>\n        <button class=\"key operator\" data-command=\"term\" data-param=\"ADD\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.ADD)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
-      buffer += "</span></button>\n    </div>\n</div>";
+      buffer += "</span></button>\n    </div>\n</div>\n";
       return buffer;
       });
     function keyboardTpl(data, options, asString) {
@@ -131,7 +131,7 @@ define(['lodash', 'ui/maths/calculator/defaultCalculator', 'handlebars', 'lib/ha
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
      *
-     * Copyright (c) 2018 Open Assessment Technologies SA ;
+     * Copyright (c) 2018-2023 Open Assessment Technologies SA ;
      */
 
     /**

package/dist/maths/calculator/calculatorComponent.js

@@ -1,9 +1,9 @@
-define(['lodash', 'ui/dynamicComponent', 'ui/maths/calculator/core/board', 'ui/maths/calculator/pluginsLoader', 'css!ui/maths/calculator/css/calculator.css'], function (_, dynamicComponent, calculatorBoardFactory, pluginsLoader, calculator_css) { 'use strict';
+define(['context', 'ui/dynamicComponent', 'ui/maths/calculator/core/board', 'core/pluginLoader', 'css!ui/maths/calculator/css/calculator.css'], function (context, dynamicComponent, calculatorBoardFactory, pluginLoaderFactory, calculator_css) { 'use strict';
 
-    _ = _ && Object.prototype.hasOwnProperty.call(_, 'default') ? _['default'] : _;
+    context = context && Object.prototype.hasOwnProperty.call(context, 'default') ? context['default'] : context;
     dynamicComponent = dynamicComponent && Object.prototype.hasOwnProperty.call(dynamicComponent, 'default') ? dynamicComponent['default'] : dynamicComponent;
     calculatorBoardFactory = calculatorBoardFactory && Object.prototype.hasOwnProperty.call(calculatorBoardFactory, 'default') ? calculatorBoardFactory['default'] : calculatorBoardFactory;
-    pluginsLoader = pluginsLoader && Object.prototype.hasOwnProperty.call(pluginsLoader, 'default') ? pluginsLoader['default'] : pluginsLoader;
+    pluginLoaderFactory = pluginLoaderFactory && Object.prototype.hasOwnProperty.call(pluginLoaderFactory, 'default') ? pluginLoaderFactory['default'] : pluginLoaderFactory;
 
     /**
      * This program is free software; you can redistribute it and/or
@@ -20,14 +20,14 @@ define(['lodash', 'ui/dynamicComponent', 'ui/maths/calculator/core/board', 'ui/m
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
      *
-     * Copyright (c) 2018-2019 Open Assessment Technologies SA ;
+     * Copyright (c) 2018-2023 Open Assessment Technologies SA ;
      */
 
     /**
      * Default config values
      * @type {Object}
      */
-    var defaultConfig = {
+    const defaultConfig = {
       preserveAspectRatio: false,
       width: 240,
       height: 360,
@@ -45,37 +45,36 @@ define(['lodash', 'ui/dynamicComponent', 'ui/maths/calculator/core/board', 'ui/m
      * @returns {dynamicComponent}
      */
     function calculatorComponentFactory(config) {
-      var calculator, calculatorComponent;
-      var api = {
+      let calculator;
+      const api = {
         /**
          * Gets the nested calculator
          * @returns {calculator}
          */
-        getCalculator: function getCalculator() {
+        getCalculator() {
           return calculator;
         }
       };
-      calculatorComponent = dynamicComponent(api, defaultConfig).on('rendercontent', function ($content) {
-        const self = this;
-        const initialWidth = self.getElement().width();
-        const initialHeight = self.getElement().height();
-        return pluginsLoader(this.getConfig().loadedPlugins, this.getConfig().dynamicPlugins).then(function (loadedPlugins) {
-          return new Promise(function (resolve) {
-            calculator = calculatorBoardFactory($content, loadedPlugins, self.getConfig().calculator).on('ready', function () {
-              var initialFontSize = parseInt(self.getCalculator().getElement().css('fontSize'), 10) || 10;
-              self.on('resize', function () {
-                if (self.getElement()) {
-                  self.getCalculator().getElement().css('fontSize', initialFontSize * Math.min(self.getElement().width() / initialWidth, self.getElement().height() / initialHeight));
+      const calculatorComponent = dynamicComponent(api, defaultConfig).on('rendercontent', function onRenderContent($content) {
+        const initialWidth = this.getElement().width();
+        const initialHeight = this.getElement().height();
+        return pluginLoaderFactory(this.getConfig().loadedPlugins).addList(this.getConfig().dynamicPlugins).load(context.bundle).then(loadedPlugins => {
+          return new Promise(resolve => {
+            calculator = calculatorBoardFactory($content, loadedPlugins, this.getConfig().calculator).on('ready', () => {
+              var initialFontSize = parseInt(this.getCalculator().getElement().css('fontSize'), 10) || 10;
+              this.on('resize', () => {
+                if (this.getElement()) {
+                  this.getCalculator().getElement().css('fontSize', initialFontSize * Math.min(this.getElement().width() / initialWidth, this.getElement().height() / initialHeight));
                 }
               }).setContentSize(calculator.getElement().outerWidth(), calculator.getElement().outerHeight()).setState('ready').trigger('ready');
               resolve();
             });
           });
         });
-      }).on('destroy', function () {
-        return new Promise(function (resolve) {
+      }).on('destroy', () => {
+        return new Promise(resolve => {
           if (calculator) {
-            calculator.after('destroy', function () {
+            calculator.after('destroy', () => {
               calculator = null;
               resolve();
             }).destroy();
@@ -84,9 +83,7 @@ define(['lodash', 'ui/dynamicComponent', 'ui/maths/calculator/core/board', 'ui/m
           }
         });
       });
-      _.defer(function () {
-        calculatorComponent.init(config);
-      });
+      setTimeout(() => calculatorComponent.init(config), 0);
       return calculatorComponent;
     }