@oat-sa/tao-core-ui 1.64.1 → 1.64.2

package/src/maths/calculator/plugins/screen/simpleScreen/defaultTemplate.tpl

@@ -1,4 +1,4 @@
-<div class="calculator-screen simple-screen">
-    <div class="screen-panel history">{{{history}}}</div>
-    <div class="screen-panel expression">{{{expression}}}</div>
+<div class="calculator-screen simple-screen">
+    <div class="screen-panel history">{{{history}}}</div>
+    <div class="screen-panel expression">{{{expression}}}</div>
 </div>

package/src/maths/calculator/plugins/screen/simpleScreen/history.tpl

@@ -1,4 +1,4 @@
-<div class="history-line">
-    <div class="history-expression">{{{expression}}}</div>
-    <div class="history-result">{{{result}}}</div>
+<div class="history-line">
+    <div class="history-expression">{{{expression}}}</div>
+    <div class="history-result">{{{result}}}</div>
 </div>

package/src/maths/calculator/plugins/screen/simpleScreen/simpleScreen.js

@@ -1,190 +1,190 @@
-/**
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; under version 2
- * of the License (non-upgradable).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 ;
- */
-/**
- * Plugin that manages a simple screen for the calculator, with configurable layout.
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-import $ from 'jquery';
-import _ from 'lodash';
-import nsHelper from 'util/namespace';
-import scrollHelper from 'ui/scroller';
-import registeredTerms from 'ui/maths/calculator/core/terms';
-import expressionHelper from 'ui/maths/calculator/core/expression';
-import pluginFactory from 'ui/maths/calculator/core/plugin';
-import historyTpl from 'ui/maths/calculator/plugins/screen/simpleScreen/history';
-import defaultScreenTpl from 'ui/maths/calculator/plugins/screen/simpleScreen/defaultTemplate';
-
-var pluginName = 'simpleScreen';
-
-/**
- * Default displayed value
- * @type {String}
- */
-var defaultExpression = '0';
-
-/**
- * Default plugin config
- * @type {Object}
- */
-var defaultConfig = {
-    // the layout of the screen
-    layout: defaultScreenTpl,
-
-    // number of decimal digits shown for decimal numbers
-    decimalDigits: 5
-};
-
-export default pluginFactory(
-    {
-        name: pluginName,
-
-        /**
-         * Called when the plugin should be initialized.
-         */
-        init: function init() {
-            var calculator = this.getCalculator();
-
-            /**
-             * Reset the current expression
-             */
-            function reset() {
-                calculator.replace(calculator.getConfig().expression || defaultExpression);
-            }
-
-            reset();
-
-            calculator
-                .after(nsHelper.namespaceAll('expressionchange', pluginName), function (expression) {
-                    // ensure the displayed expression is at least a 0 (never be an empty string)
-                    if (!expression.trim()) {
-                        _.defer(reset);
-                    }
-                })
-                .after(nsHelper.namespaceAll('evaluate', pluginName), function () {
-                    // when the expression is computed, replace it with the result as a variable
-                    calculator.replace(registeredTerms.ANS.value);
-                })
-                .on(nsHelper.namespaceAll('clear', pluginName), reset);
-        },
-
-        /**
-         * Called when the plugin should be rendered.
-         */
-        render: function render() {
-            var self = this;
-            var calculator = this.getCalculator();
-            var areaBroker = calculator.getAreaBroker();
-            var pluginConfig = this.getConfig();
-            var tokenizer = calculator.getTokenizer();
-
-            /**
-             * Auto scroll to the last child of a container
-             * @param {jQuery} $container
-             * @param {String} [sel]
-             */
-            function autoScroll($container, sel) {
-                scrollHelper.scrollTo($container.find(':last-child ' + (sel || '')), $container);
-            }
-
-            /**
-             * Renders the expression into a string
-             * @param {String|Object|token[]} expression
-             * @returns {String}
-             */
-            function renderExpression(expression) {
-                var variables = expressionHelper.roundLastResultVariable(
-                    calculator.getVariables(),
-                    pluginConfig.decimalDigits
-                );
-                return expressionHelper.render(expression, variables, tokenizer);
-            }
-
-            /**
-             * Updates the expression area
-             * @param {String|Object|token[]} tokens
-             */
-            function showExpression(tokens) {
-                self.controls.$expression.html(renderExpression(tokens));
-                autoScroll(self.controls.$expression);
-            }
-
-            if (!_.isFunction(pluginConfig.layout)) {
-                throw new TypeError('The screen plugin requires a template to render!');
-            }
-
-            this.$layout = $(
-                pluginConfig.layout(
-                    _.defaults(
-                        {
-                            expression: renderExpression(calculator.getTokens())
-                        },
-                        pluginConfig
-                    )
-                )
-            );
-
-            this.controls = {
-                $history: this.$layout.find('.history'),
-                $expression: this.$layout.find('.expression')
-            };
-
-            calculator
-                .on(nsHelper.namespaceAll('command-clearAll', pluginName), function () {
-                    self.controls.$history.empty();
-                })
-                .on(nsHelper.namespaceAll('expressionchange', pluginName), function () {
-                    calculator.setState('error', false);
-                    showExpression(calculator.getTokens());
-                })
-                .on(nsHelper.namespaceAll('evaluate', pluginName), function (result) {
-                    self.controls.$history.html(
-                        historyTpl({
-                            expression: renderExpression(calculator.getTokens()),
-                            result: renderExpression(result)
-                        })
-                    );
-                    autoScroll(self.controls.$history, '.history-result');
-                })
-                .after(nsHelper.namespaceAll('evaluate', pluginName), function (result) {
-                    if (expressionHelper.containsError(result.value)) {
-                        showExpression(result);
-                    }
-                })
-                .on(nsHelper.namespaceAll('syntaxerror', pluginName), function () {
-                    calculator.setState('error', true);
-                    showExpression(calculator.getExpression() + registeredTerms.ERROR.value);
-                });
-
-            areaBroker.getScreenArea().append(this.$layout);
-        },
-
-        /**
-         * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
-         */
-        destroy: function destroy() {
-            var calculator = this.getCalculator();
-            if (this.$layout) {
-                this.$layout.off('.' + pluginName).remove();
-                this.$layout = null;
-            }
-            this.controls = null;
-            calculator.off('.' + pluginName);
-        }
-    },
-    defaultConfig
-);
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 ;
+ */
+/**
+ * Plugin that manages a simple screen for the calculator, with configurable layout.
+ * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ */
+import $ from 'jquery';
+import _ from 'lodash';
+import nsHelper from 'util/namespace';
+import scrollHelper from 'ui/scroller';
+import registeredTerms from 'ui/maths/calculator/core/terms';
+import expressionHelper from 'ui/maths/calculator/core/expression';
+import pluginFactory from 'ui/maths/calculator/core/plugin';
+import historyTpl from 'ui/maths/calculator/plugins/screen/simpleScreen/history';
+import defaultScreenTpl from 'ui/maths/calculator/plugins/screen/simpleScreen/defaultTemplate';
+
+var pluginName = 'simpleScreen';
+
+/**
+ * Default displayed value
+ * @type {String}
+ */
+var defaultExpression = '0';
+
+/**
+ * Default plugin config
+ * @type {Object}
+ */
+var defaultConfig = {
+    // the layout of the screen
+    layout: defaultScreenTpl,
+
+    // number of decimal digits shown for decimal numbers
+    decimalDigits: 5
+};
+
+export default pluginFactory(
+    {
+        name: pluginName,
+
+        /**
+         * Called when the plugin should be initialized.
+         */
+        init: function init() {
+            var calculator = this.getCalculator();
+
+            /**
+             * Reset the current expression
+             */
+            function reset() {
+                calculator.replace(calculator.getConfig().expression || defaultExpression);
+            }
+
+            reset();
+
+            calculator
+                .after(nsHelper.namespaceAll('expressionchange', pluginName), function (expression) {
+                    // ensure the displayed expression is at least a 0 (never be an empty string)
+                    if (!expression.trim()) {
+                        _.defer(reset);
+                    }
+                })
+                .after(nsHelper.namespaceAll('evaluate', pluginName), function () {
+                    // when the expression is computed, replace it with the result as a variable
+                    calculator.replace(registeredTerms.ANS.value);
+                })
+                .on(nsHelper.namespaceAll('clear', pluginName), reset);
+        },
+
+        /**
+         * Called when the plugin should be rendered.
+         */
+        render: function render() {
+            var self = this;
+            var calculator = this.getCalculator();
+            var areaBroker = calculator.getAreaBroker();
+            var pluginConfig = this.getConfig();
+            var tokenizer = calculator.getTokenizer();
+
+            /**
+             * Auto scroll to the last child of a container
+             * @param {jQuery} $container
+             * @param {String} [sel]
+             */
+            function autoScroll($container, sel) {
+                scrollHelper.scrollTo($container.find(':last-child ' + (sel || '')), $container);
+            }
+
+            /**
+             * Renders the expression into a string
+             * @param {String|Object|token[]} expression
+             * @returns {String}
+             */
+            function renderExpression(expression) {
+                var variables = expressionHelper.roundLastResultVariable(
+                    calculator.getVariables(),
+                    pluginConfig.decimalDigits
+                );
+                return expressionHelper.render(expression, variables, tokenizer);
+            }
+
+            /**
+             * Updates the expression area
+             * @param {String|Object|token[]} tokens
+             */
+            function showExpression(tokens) {
+                self.controls.$expression.html(renderExpression(tokens));
+                autoScroll(self.controls.$expression);
+            }
+
+            if (!_.isFunction(pluginConfig.layout)) {
+                throw new TypeError('The screen plugin requires a template to render!');
+            }
+
+            this.$layout = $(
+                pluginConfig.layout(
+                    _.defaults(
+                        {
+                            expression: renderExpression(calculator.getTokens())
+                        },
+                        pluginConfig
+                    )
+                )
+            );
+
+            this.controls = {
+                $history: this.$layout.find('.history'),
+                $expression: this.$layout.find('.expression')
+            };
+
+            calculator
+                .on(nsHelper.namespaceAll('command-clearAll', pluginName), function () {
+                    self.controls.$history.empty();
+                })
+                .on(nsHelper.namespaceAll('expressionchange', pluginName), function () {
+                    calculator.setState('error', false);
+                    showExpression(calculator.getTokens());
+                })
+                .on(nsHelper.namespaceAll('evaluate', pluginName), function (result) {
+                    self.controls.$history.html(
+                        historyTpl({
+                            expression: renderExpression(calculator.getTokens()),
+                            result: renderExpression(result)
+                        })
+                    );
+                    autoScroll(self.controls.$history, '.history-result');
+                })
+                .after(nsHelper.namespaceAll('evaluate', pluginName), function (result) {
+                    if (expressionHelper.containsError(result.value)) {
+                        showExpression(result);
+                    }
+                })
+                .on(nsHelper.namespaceAll('syntaxerror', pluginName), function () {
+                    calculator.setState('error', true);
+                    showExpression(calculator.getExpression() + registeredTerms.ERROR.value);
+                });
+
+            areaBroker.getScreenArea().append(this.$layout);
+        },
+
+        /**
+         * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
+         */
+        destroy: function destroy() {
+            var calculator = this.getCalculator();
+            if (this.$layout) {
+                this.$layout.off('.' + pluginName).remove();
+                this.$layout = null;
+            }
+            this.controls = null;
+            calculator.off('.' + pluginName);
+        }
+    },
+    defaultConfig
+);

package/src/maths/calculator/pluginsLoader.js

@@ -1,46 +1,46 @@
-/**
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; under version 2
- * of the License (non-upgradable).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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>
- */
-import context from 'context';
-import pluginLoaderFactory from 'core/pluginLoader';
-import pluginDegradFactory from 'ui/maths/calculator/plugins/core/degrad';
-import pluginHistoryFactory from 'ui/maths/calculator/plugins/core/history';
-import pluginRemindFactory from 'ui/maths/calculator/plugins/core/remind';
-import pluginStepNavigationFactory from 'ui/maths/calculator/plugins/core/stepNavigation';
-import _ from 'lodash';
-
-/**
- * Load the plugins dynamically
- * @param {Object} loadedPlugins - a collection of already loaded plugins
- * @param {Object} dynamicPlugins - a collection of plugins to load
- * @returns {Promise} resolves with the list of loaded plugins
- */
-export default function loadPlugins(loadedPlugins, dynamicPlugins) {
-    // The list of default plugins is directly built here instead of using a module variable to ensure the object
-    // is unique to the instance. This wil avoid global polluting by successive instances, as nested objects and
-    // arrays might be simply copied.
-    var defaultPlugins = {
-        core: [pluginDegradFactory, pluginHistoryFactory, pluginRemindFactory, pluginStepNavigationFactory]
-    };
-
-    return pluginLoaderFactory(_.merge({}, defaultPlugins, loadedPlugins))
-        .addList(dynamicPlugins)
-        .load(context.bundle);
-}
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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>
+ */
+import context from 'context';
+import pluginLoaderFactory from 'core/pluginLoader';
+import pluginDegradFactory from 'ui/maths/calculator/plugins/core/degrad';
+import pluginHistoryFactory from 'ui/maths/calculator/plugins/core/history';
+import pluginRemindFactory from 'ui/maths/calculator/plugins/core/remind';
+import pluginStepNavigationFactory from 'ui/maths/calculator/plugins/core/stepNavigation';
+import _ from 'lodash';
+
+/**
+ * Load the plugins dynamically
+ * @param {Object} loadedPlugins - a collection of already loaded plugins
+ * @param {Object} dynamicPlugins - a collection of plugins to load
+ * @returns {Promise} resolves with the list of loaded plugins
+ */
+export default function loadPlugins(loadedPlugins, dynamicPlugins) {
+    // The list of default plugins is directly built here instead of using a module variable to ensure the object
+    // is unique to the instance. This wil avoid global polluting by successive instances, as nested objects and
+    // arrays might be simply copied.
+    var defaultPlugins = {
+        core: [pluginDegradFactory, pluginHistoryFactory, pluginRemindFactory, pluginStepNavigationFactory]
+    };
+
+    return pluginLoaderFactory(_.merge({}, defaultPlugins, loadedPlugins))
+        .addList(dynamicPlugins)
+        .load(context.bundle);
+}

package/src/maths/calculator/scientificCalculator.js

@@ -1,74 +1,74 @@
-/**
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; under version 2
- * of the License (non-upgradable).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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>
- */
-import _ from 'lodash';
-import __ from 'i18n';
-import defaultCalculatorFactory from 'ui/maths/calculator/defaultCalculator';
-import pluginSign from 'ui/maths/calculator/plugins/modifiers/sign';
-import pluginPow10 from 'ui/maths/calculator/plugins/modifiers/pow10';
-import keyboardTpl from 'ui/maths/calculator/tpl/scientificKeyboard';
-import screenTpl from 'ui/maths/calculator/tpl/scientificScreen';
-
-/**
- * Default config values
- * @type {Object}
- */
-var defaultConfig = {
-    title: __('Scientific Calculator'),
-    width: 450,
-    height: 400,
-    minWidth: 250,
-    minHeight: 220
-};
-
-/**
- * Creates a scientific calculator component. Screen and keyboard layout are replaceable.
- * @param {Object} config - Some config entries (@see ui/dynamicComponent)
- * @param {Function} [config.keyboardLayout] - A Handlebars template for the keyboard
- * @param {Function} [config.screenLayout] - A Handlebars template for the screen
- * @param {Object} [config.calculator] - Config for the calculator (@see ui/maths/calculator/core/board)
- * @returns {dynamicComponent}
- */
-export default function scientificCalculator(config) {
-    // The plugins config is directly built here instead of using a module variable to ensure the object is unique
-    // 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: {
-                            layout: keyboardTpl
-                        },
-                        simpleScreen: {
-                            layout: screenTpl
-                        }
-                    }
-                }
-            },
-            defaultConfig,
-            config
-        )
-    );
-}
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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>
+ */
+import _ from 'lodash';
+import __ from 'i18n';
+import defaultCalculatorFactory from 'ui/maths/calculator/defaultCalculator';
+import pluginSign from 'ui/maths/calculator/plugins/modifiers/sign';
+import pluginPow10 from 'ui/maths/calculator/plugins/modifiers/pow10';
+import keyboardTpl from 'ui/maths/calculator/tpl/scientificKeyboard';
+import screenTpl from 'ui/maths/calculator/tpl/scientificScreen';
+
+/**
+ * Default config values
+ * @type {Object}
+ */
+var defaultConfig = {
+    title: __('Scientific Calculator'),
+    width: 450,
+    height: 400,
+    minWidth: 250,
+    minHeight: 220
+};
+
+/**
+ * Creates a scientific calculator component. Screen and keyboard layout are replaceable.
+ * @param {Object} config - Some config entries (@see ui/dynamicComponent)
+ * @param {Function} [config.keyboardLayout] - A Handlebars template for the keyboard
+ * @param {Function} [config.screenLayout] - A Handlebars template for the screen
+ * @param {Object} [config.calculator] - Config for the calculator (@see ui/maths/calculator/core/board)
+ * @returns {dynamicComponent}
+ */
+export default function scientificCalculator(config) {
+    // The plugins config is directly built here instead of using a module variable to ensure the object is unique
+    // 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: {
+                            layout: keyboardTpl
+                        },
+                        simpleScreen: {
+                            layout: screenTpl
+                        }
+                    }
+                }
+            },
+            defaultConfig,
+            config
+        )
+    );
+}