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

package/dist/maths/calculator/scientificCalculator.js

@@ -1,10 +1,8 @@
-define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/calculator/plugins/modifiers/sign', 'ui/maths/calculator/plugins/modifiers/pow10', 'handlebars', 'lib/handlebars/helpers'], function (_, __, defaultCalculatorFactory, pluginSign, pluginPow10, Handlebars, Helpers0) { 'use strict';
+define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'handlebars', 'lib/handlebars/helpers'], function (_, __, defaultCalculatorFactory, Handlebars, Helpers0) { 'use strict';
 
     _ = _ && Object.prototype.hasOwnProperty.call(_, 'default') ? _['default'] : _;
     __ = __ && Object.prototype.hasOwnProperty.call(__, 'default') ? __['default'] : __;
     defaultCalculatorFactory = defaultCalculatorFactory && Object.prototype.hasOwnProperty.call(defaultCalculatorFactory, 'default') ? defaultCalculatorFactory['default'] : defaultCalculatorFactory;
-    pluginSign = pluginSign && Object.prototype.hasOwnProperty.call(pluginSign, 'default') ? pluginSign['default'] : pluginSign;
-    pluginPow10 = pluginPow10 && Object.prototype.hasOwnProperty.call(pluginPow10, 'default') ? pluginPow10['default'] : pluginPow10;
     Handlebars = Handlebars && Object.prototype.hasOwnProperty.call(Handlebars, 'default') ? Handlebars['default'] : Handlebars;
     Helpers0 = Helpers0 && Object.prototype.hasOwnProperty.call(Helpers0, 'default') ? Helpers0['default'] : Helpers0;
 
@@ -35,11 +33,11 @@ define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/cal
       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=\"SIN\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.SIN)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
@@ -122,7 +120,7 @@ define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/cal
       buffer += "</span></button>\n        <button class=\"key operator\" data-command=\"term\" data-param=\"@NTHRT\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.NTHRT)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
-      buffer += "</span></button>\n        <button class=\"key operator\" data-command=\"pow10\"><span>";
+      buffer += "</span></button>\n        <button class=\"key operator\" data-command=\"term\" data-param=\"TEN POW\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.POW10)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
       if(stack1 || stack1 === 0) { buffer += stack1; }
       buffer += "</span></button>\n        <button class=\"key operand\" data-command=\"term\" data-param=\"NUM1\"><span>";
@@ -161,7 +159,7 @@ define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/cal
       buffer += "</span></button>\n        <button class=\"key execute\" data-command=\"execute\"><span>";
       stack1 = ((stack1 = ((stack1 = (depth0 && depth0.labels)),stack1 == null || stack1 === false ? stack1 : stack1.EXECUTE)),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) {
@@ -210,14 +208,14 @@ define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/cal
      * 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 ;
      */
 
     /**
      * Default config values
      * @type {Object}
      */
-    var defaultConfig = {
+    const defaultConfig = {
       title: __('Scientific Calculator'),
       width: 450,
       height: 400,
@@ -238,9 +236,6 @@ define(['lodash', 'i18n', 'ui/maths/calculator/defaultCalculator', 'ui/maths/cal
       // to the instance. This wil avoid global polluting by successive instances, as nested objects and arrays might
       // be simply copied.
       return defaultCalculatorFactory(_.merge({
-        loadedPlugins: {
-          modifiers: [pluginSign, pluginPow10]
-        },
         calculator: {
           plugins: {
             templateKeyboard: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "1.67.0",
+    "version": "1.69.0",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {
@@ -47,18 +47,17 @@
         "@babel/eslint-parser": "^7.19.1",
         "@babel/preset-env": "^7.19.4",
         "@oat-sa/browserslist-config-tao": "^1.0.1",
-        "@oat-sa/eslint-config-tao": "^1.2.0",
-        "@oat-sa/expr-eval": "^1.3.1",
+        "@oat-sa/eslint-config-tao": "^2.0.0",
         "@oat-sa/prettier-config": "^0.1.1",
         "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
-        "@oat-sa/tao-core-libs": "^0.5.1",
-        "@oat-sa/tao-core-sdk": "^1.21.1",
+        "@oat-sa/tao-calculator": "^0.6.1",
+        "@oat-sa/tao-core-libs": "^0.5.2",
+        "@oat-sa/tao-core-sdk": "^2.0.0",
         "@oat-sa/tao-core-shared-libs": "^1.4.1",
         "@oat-sa/tao-qunit-testrunner": "^1.0.3",
         "async": "^0.2.10",
         "autoprefixer": "^9.5.1",
         "cross-env": "^7.0.2",
-        "decimal.js": "10.1.1",
         "devbridge-autocomplete": "^1.2.20",
         "dompurify": "^2.4.0",
         "eslint": "^8.25.0",
@@ -75,7 +74,6 @@
         "lodash": "2.4.1",
         "moment": "^2.29.4",
         "moment-timezone": "^0.5.37",
-        "moo": "^0.5.2",
         "npm-run-all": "^4.1.5",
         "nyc": "^15.0.1",
         "open-cli": "^7.1.0",

package/src/ckeditor/ckConfigurator.js

@@ -19,6 +19,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 import dtdHandler from 'ui/ckeditor/dtdHandler';
 import 'ckeditor';
+import context from 'context';
 import module from 'module';
 import featuresService from 'services/features';
 
@@ -56,7 +57,8 @@ const ckConfigurator = (function () {
             {
                 name: 'links',
                 items: ['Link']
-            },{
+            },
+            {
                 name: 'language',
                 items: ['Language']
             }
@@ -454,7 +456,7 @@ const ckConfigurator = (function () {
         disableNativeTableHandles: true
     };
 
-    if(moduleConfig && moduleConfig.specialChars) {
+    if (moduleConfig && moduleConfig.specialChars) {
         ckConfigDefault.specialChars = moduleConfig.specialChars;
     }
 
@@ -642,11 +644,11 @@ const ckConfigurator = (function () {
             }
             if (options.furiganaPlugin && featuresService.isVisible(furiganaPluginVisibilityKey, false)) {
                 if (!options.toolbar || options.toolbar.find(el => el.items.includes('Superscript'))) {
-                    positionedPlugins.TaoFurigana = {insertAfter: 'Superscript'};
+                    positionedPlugins.TaoFurigana = { insertAfter: 'Superscript' };
                 } else {
                     const lastGroup = options.toolbar[options.toolbar.length - 1];
                     const firstPlugin = lastGroup.items[0];
-                    positionedPlugins.TaoFurigana = {insertBefore: firstPlugin};
+                    positionedPlugins.TaoFurigana = { insertBefore: firstPlugin };
                 }
             }
         }
@@ -666,6 +668,11 @@ const ckConfigurator = (function () {
         // add the toolbar
         if (typeof toolbars[toolbarType] !== 'undefined') {
             ckConfig.toolbar = toolbars[toolbarType];
+
+            //enable sourcedialog plugin upon featureflag (false by default)
+            if (context.featureFlags && context.featureFlags.FEATURE_FLAG_CKEDITOR_SOURCEDIALOG) {
+                ckConfig.toolbar.push({ name: 'sourcedialog', items: ['Sourcedialog'] });
+            }
         }
 
         // ensures positionedPlugins has the right format

package/src/maths/calculator/basicCalculator.js

@@ -13,10 +13,7 @@
  * 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 ;
- */
-/**
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ * Copyright (c) 2018-2023 Open Assessment Technologies SA ;
  */
 import _ from 'lodash';
 import defaultCalculatorFactory from 'ui/maths/calculator/defaultCalculator';

package/src/maths/calculator/calculatorComponent.js

@@ -13,22 +13,19 @@
  * 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 ;
  */
-/**
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-import _ from 'lodash';
+import context from 'context';
 import dynamicComponent from 'ui/dynamicComponent';
 import calculatorBoardFactory from 'ui/maths/calculator/core/board';
-import pluginsLoader from 'ui/maths/calculator/pluginsLoader';
+import pluginLoaderFactory from 'core/pluginLoader';
 import 'ui/maths/calculator/css/calculator.css';
 
 /**
  * Default config values
  * @type {Object}
  */
-var defaultConfig = {
+const defaultConfig = {
     preserveAspectRatio: false,
     width: 240,
     height: 360,
@@ -46,70 +43,64 @@ var defaultConfig = {
  * @returns {dynamicComponent}
  */
 export default function calculatorComponentFactory(config) {
-    var calculator, calculatorComponent;
+    let calculator;
 
-    var api = {
+    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();
+    const calculatorComponent = dynamicComponent(api, defaultConfig)
+        .on('rendercontent', function onRenderContent($content) {
+            const initialWidth = this.getElement().width();
+            const initialHeight = this.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
-                                                )
-                                        );
-                                }
-                            })
-                                .setContentSize(
-                                    calculator.getElement().outerWidth(),
-                                    calculator.getElement().outerHeight()
-                                )
-                                .setState('ready')
-                                .trigger('ready');
-                            resolve();
-                        }
-                    );
+            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() {
+                        .after('destroy', () => {
                             calculator = null;
                             resolve();
                         })
@@ -120,9 +111,7 @@ export default function calculatorComponentFactory(config) {
             });
         });
 
-    _.defer(function() {
-        calculatorComponent.init(config);
-    });
+    setTimeout(() => calculatorComponent.init(config), 0);
 
     return calculatorComponent;
 }