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

package/src/maths/calculator/plugins/core/remind.js

@@ -1,96 +1,96 @@
-/**
- * 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 value reminder in the calculator
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-
-import __ from 'i18n';
-import nsHelper from 'util/namespace';
-import pluginFactory from 'ui/maths/calculator/core/plugin';
-
-var pluginName = 'remind';
-var varRemindName = 'mem';
-var varLastName = 'last';
-
-export default pluginFactory({
-    name: pluginName,
-
-    /**
-     * Called when the plugin is installing in its host.
-     */
-    install: function install() {
-        var calculator = this.getCalculator();
-
-        calculator
-            .setCommand('remind', __('Remind'), __('Remind the recorded value'))
-            .setCommand('remindLast', __('Remind Last'), __('Remind the last value'))
-            .setCommand('remindStore', __('Store'), __('Store the value a variable'))
-            .setCommand('remindClear', __('Clear'), __('Clear the stored variables'));
-    },
-
-    /**
-     * Called when the plugin should be initialized.
-     */
-    init: function init() {
-        var calculator = this.getCalculator();
-
-        calculator
-            .on(nsHelper.namespaceAll('evaluate', pluginName), function(result) {
-                calculator.setVariable(varLastName, result);
-            })
-            .on(nsHelper.namespaceAll('command-remind', pluginName), function() {
-                if (calculator.hasVariable(varRemindName)) {
-                    calculator.useVariable(varRemindName);
-                }
-            })
-            .on(nsHelper.namespaceAll('command-remindLast', pluginName), function() {
-                if (calculator.hasVariable(varLastName)) {
-                    calculator.useVariable(varLastName);
-                }
-            })
-            .on(nsHelper.namespaceAll('command-remindStore', pluginName), function() {
-                if (calculator.hasVariable(varLastName)) {
-                    calculator.setVariable(varRemindName, calculator.getVariable(varLastName));
-                }
-            })
-            .on(nsHelper.namespaceAll('command-remindClear command-clearAll destroy', pluginName), function() {
-                if (calculator.hasVariable(varRemindName)) {
-                    calculator.deleteVariable(varRemindName);
-                }
-            })
-            .on(nsHelper.namespaceAll('destroy', pluginName), function() {
-                if (calculator.hasVariable(varLastName)) {
-                    calculator.deleteVariable(varLastName);
-                }
-            });
-    },
-
-    /**
-     * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
-     */
-    destroy: function destroy() {
-        var calculator = this.getCalculator();
-        calculator
-            .deleteCommand('remind')
-            .deleteCommand('remindLast')
-            .deleteCommand('remindStore')
-            .deleteCommand('remindClear')
-            .off('.' + pluginName);
-    }
-});
+/**
+ * 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 value reminder in the calculator
+ * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ */
+
+import __ from 'i18n';
+import nsHelper from 'util/namespace';
+import pluginFactory from 'ui/maths/calculator/core/plugin';
+
+var pluginName = 'remind';
+var varRemindName = 'mem';
+var varLastName = 'last';
+
+export default pluginFactory({
+    name: pluginName,
+
+    /**
+     * Called when the plugin is installing in its host.
+     */
+    install: function install() {
+        var calculator = this.getCalculator();
+
+        calculator
+            .setCommand('remind', __('Remind'), __('Remind the recorded value'))
+            .setCommand('remindLast', __('Remind Last'), __('Remind the last value'))
+            .setCommand('remindStore', __('Store'), __('Store the value a variable'))
+            .setCommand('remindClear', __('Clear'), __('Clear the stored variables'));
+    },
+
+    /**
+     * Called when the plugin should be initialized.
+     */
+    init: function init() {
+        var calculator = this.getCalculator();
+
+        calculator
+            .on(nsHelper.namespaceAll('evaluate', pluginName), function(result) {
+                calculator.setVariable(varLastName, result);
+            })
+            .on(nsHelper.namespaceAll('command-remind', pluginName), function() {
+                if (calculator.hasVariable(varRemindName)) {
+                    calculator.useVariable(varRemindName);
+                }
+            })
+            .on(nsHelper.namespaceAll('command-remindLast', pluginName), function() {
+                if (calculator.hasVariable(varLastName)) {
+                    calculator.useVariable(varLastName);
+                }
+            })
+            .on(nsHelper.namespaceAll('command-remindStore', pluginName), function() {
+                if (calculator.hasVariable(varLastName)) {
+                    calculator.setVariable(varRemindName, calculator.getVariable(varLastName));
+                }
+            })
+            .on(nsHelper.namespaceAll('command-remindClear command-clearAll destroy', pluginName), function() {
+                if (calculator.hasVariable(varRemindName)) {
+                    calculator.deleteVariable(varRemindName);
+                }
+            })
+            .on(nsHelper.namespaceAll('destroy', pluginName), function() {
+                if (calculator.hasVariable(varLastName)) {
+                    calculator.deleteVariable(varLastName);
+                }
+            });
+    },
+
+    /**
+     * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
+     */
+    destroy: function destroy() {
+        var calculator = this.getCalculator();
+        calculator
+            .deleteCommand('remind')
+            .deleteCommand('remindLast')
+            .deleteCommand('remindStore')
+            .deleteCommand('remindClear')
+            .off('.' + pluginName);
+    }
+});

package/src/maths/calculator/plugins/core/stepNavigation.js

@@ -1,175 +1,175 @@
-/**
- * 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 navigation by tokens within the current expression
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-
-import __ from 'i18n';
-import nsHelper from 'util/namespace';
-import pluginFactory from 'ui/maths/calculator/core/plugin';
-
-var pluginName = 'stepNavigation';
-
-export default pluginFactory({
-    name: pluginName,
-
-    /**
-     * Called when the plugin is installing in its host.
-     */
-    install: function install() {
-        var calculator = this.getCalculator();
-
-        calculator
-            .setCommand('stepMoveLeft', __('Move Left'), __('Move the cursor one step on the left'))
-            .setCommand('stepMoveRight', __('Move Right'), __('Move the cursor one step on the right'))
-            .setCommand('stepDeleteLeft', __('Delete Left'), __('Delete the term on the left side of the cursor'))
-            .setCommand('stepDeleteRight', __('Delete Right'), __('Delete the term on the right side of the cursor'));
-    },
-
-    /**
-     * Called when the plugin should be initialized.
-     */
-    init: function init() {
-        var calculator = this.getCalculator();
-
-        /**
-         * Remove a sub-expresion from the expression
-         * @param expression
-         * @param position
-         * @param length
-         */
-        function remove(expression, position, length) {
-            if (length) {
-                expression = calculator.getExpression();
-                calculator
-                    .setExpression(expression.substr(0, position) + expression.substr(position + length))
-                    .setPosition(position);
-            }
-        }
-
-        /**
-         * Remove a token from the expression
-         * @param expression
-         * @param token
-         */
-        function removeToken(expression, token) {
-            var from, length;
-            if (token) {
-                expression = calculator.getExpression();
-                from = token.offset;
-                length = token.value.length;
-                while (from + length < expression.length && expression.charAt(from + length) === ' ') {
-                    length++;
-                }
-
-                remove(expression, from, length);
-            }
-        }
-
-        calculator
-            .on(nsHelper.namespaceAll('command-stepMoveLeft', pluginName), function() {
-                var position = calculator.getPosition();
-                var tokens = calculator.getTokens();
-                var index = calculator.getTokenIndex();
-                var token = calculator.getToken();
-                var offset = position;
-
-                if (token && position > 0) {
-                    if (position === token.offset) {
-                        if (index > 0) {
-                            token = tokens[index - 1];
-                        } else {
-                            token = null;
-                        }
-                    }
-                } else {
-                    token = null;
-                }
-                if (token) {
-                    offset = token.offset;
-                } else {
-                    offset = 0;
-                }
-
-                if (offset !== position) {
-                    calculator.setPosition(offset);
-                }
-            })
-            .on(nsHelper.namespaceAll('command-stepMoveRight', pluginName), function() {
-                var expression = calculator.getExpression();
-                var position = calculator.getPosition();
-                var tokens = calculator.getTokens();
-                var index = calculator.getTokenIndex();
-                var token = calculator.getToken();
-                var offset = expression.length;
-
-                if (token && index < tokens.length - 1) {
-                    token = tokens[index + 1];
-                    if (token) {
-                        offset = token.offset;
-                    }
-                }
-
-                if (offset !== position) {
-                    calculator.setPosition(offset);
-                }
-            })
-            .on(nsHelper.namespaceAll('command-stepDeleteLeft', pluginName), function() {
-                var expression = calculator.getExpression();
-                var position = calculator.getPosition();
-                var tokens = calculator.getTokens();
-                var index = calculator.getTokenIndex();
-                var token = calculator.getToken();
-
-                if (token) {
-                    if (position > token.offset) {
-                        removeToken(expression, token);
-                    } else {
-                        if (index > 0) {
-                            removeToken(expression, tokens[index - 1]);
-                        } else if (position > 0) {
-                            remove(expression, 0, token.offset);
-                        }
-                    }
-                }
-            })
-            .on(nsHelper.namespaceAll('command-stepDeleteRight', pluginName), function() {
-                var expression = calculator.getExpression();
-                var position = calculator.getPosition();
-                var token = calculator.getToken();
-
-                if (token && position >= token.offset && position < token.offset + token.value.length) {
-                    removeToken(expression, token);
-                }
-            });
-    },
-
-    /**
-     * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
-     */
-    destroy: function destroy() {
-        var calculator = this.getCalculator();
-        calculator
-            .deleteCommand('stepMoveLeft')
-            .deleteCommand('stepMoveRight')
-            .deleteCommand('stepDeleteLeft')
-            .deleteCommand('stepDeleteRight')
-            .off('.' + pluginName);
-    }
-});
+/**
+ * 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 navigation by tokens within the current expression
+ * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ */
+
+import __ from 'i18n';
+import nsHelper from 'util/namespace';
+import pluginFactory from 'ui/maths/calculator/core/plugin';
+
+var pluginName = 'stepNavigation';
+
+export default pluginFactory({
+    name: pluginName,
+
+    /**
+     * Called when the plugin is installing in its host.
+     */
+    install: function install() {
+        var calculator = this.getCalculator();
+
+        calculator
+            .setCommand('stepMoveLeft', __('Move Left'), __('Move the cursor one step on the left'))
+            .setCommand('stepMoveRight', __('Move Right'), __('Move the cursor one step on the right'))
+            .setCommand('stepDeleteLeft', __('Delete Left'), __('Delete the term on the left side of the cursor'))
+            .setCommand('stepDeleteRight', __('Delete Right'), __('Delete the term on the right side of the cursor'));
+    },
+
+    /**
+     * Called when the plugin should be initialized.
+     */
+    init: function init() {
+        var calculator = this.getCalculator();
+
+        /**
+         * Remove a sub-expresion from the expression
+         * @param expression
+         * @param position
+         * @param length
+         */
+        function remove(expression, position, length) {
+            if (length) {
+                expression = calculator.getExpression();
+                calculator
+                    .setExpression(expression.substr(0, position) + expression.substr(position + length))
+                    .setPosition(position);
+            }
+        }
+
+        /**
+         * Remove a token from the expression
+         * @param expression
+         * @param token
+         */
+        function removeToken(expression, token) {
+            var from, length;
+            if (token) {
+                expression = calculator.getExpression();
+                from = token.offset;
+                length = token.value.length;
+                while (from + length < expression.length && expression.charAt(from + length) === ' ') {
+                    length++;
+                }
+
+                remove(expression, from, length);
+            }
+        }
+
+        calculator
+            .on(nsHelper.namespaceAll('command-stepMoveLeft', pluginName), function() {
+                var position = calculator.getPosition();
+                var tokens = calculator.getTokens();
+                var index = calculator.getTokenIndex();
+                var token = calculator.getToken();
+                var offset = position;
+
+                if (token && position > 0) {
+                    if (position === token.offset) {
+                        if (index > 0) {
+                            token = tokens[index - 1];
+                        } else {
+                            token = null;
+                        }
+                    }
+                } else {
+                    token = null;
+                }
+                if (token) {
+                    offset = token.offset;
+                } else {
+                    offset = 0;
+                }
+
+                if (offset !== position) {
+                    calculator.setPosition(offset);
+                }
+            })
+            .on(nsHelper.namespaceAll('command-stepMoveRight', pluginName), function() {
+                var expression = calculator.getExpression();
+                var position = calculator.getPosition();
+                var tokens = calculator.getTokens();
+                var index = calculator.getTokenIndex();
+                var token = calculator.getToken();
+                var offset = expression.length;
+
+                if (token && index < tokens.length - 1) {
+                    token = tokens[index + 1];
+                    if (token) {
+                        offset = token.offset;
+                    }
+                }
+
+                if (offset !== position) {
+                    calculator.setPosition(offset);
+                }
+            })
+            .on(nsHelper.namespaceAll('command-stepDeleteLeft', pluginName), function() {
+                var expression = calculator.getExpression();
+                var position = calculator.getPosition();
+                var tokens = calculator.getTokens();
+                var index = calculator.getTokenIndex();
+                var token = calculator.getToken();
+
+                if (token) {
+                    if (position > token.offset) {
+                        removeToken(expression, token);
+                    } else {
+                        if (index > 0) {
+                            removeToken(expression, tokens[index - 1]);
+                        } else if (position > 0) {
+                            remove(expression, 0, token.offset);
+                        }
+                    }
+                }
+            })
+            .on(nsHelper.namespaceAll('command-stepDeleteRight', pluginName), function() {
+                var expression = calculator.getExpression();
+                var position = calculator.getPosition();
+                var token = calculator.getToken();
+
+                if (token && position >= token.offset && position < token.offset + token.value.length) {
+                    removeToken(expression, token);
+                }
+            });
+    },
+
+    /**
+     * Called when the plugin is destroyed. Mostly when the host is destroyed itself.
+     */
+    destroy: function destroy() {
+        var calculator = this.getCalculator();
+        calculator
+            .deleteCommand('stepMoveLeft')
+            .deleteCommand('stepMoveRight')
+            .deleteCommand('stepDeleteLeft')
+            .deleteCommand('stepDeleteRight')
+            .off('.' + pluginName);
+    }
+});

package/src/maths/calculator/plugins/keyboard/templateKeyboard/defaultTemplate.tpl

@@ -1,37 +1,37 @@
-<div class="calculator-keyboard">
-    <div class="row">
-        <button class="key operator" data-command="term" data-param="SQRT"><span>{{{labels.SQRT}}}</span></button>
-        <button class="key operator" data-command="term" data-param="LPAR"><span>{{{labels.LPAR}}}</span></button>
-        <button class="key operator" data-command="term" data-param="RPAR"><span>{{{labels.RPAR}}}</span></button>
-        <button class="key command" data-command="clear"><span>{{{labels.CLEAR}}}</span></button>
-        <button class="key command" data-command="clearAll"><span>{{{labels.CLEARALL}}}</span></button>
-    </div>
-    <div class="row">
-        <button class="key operator" data-command="term" data-param="CBRT"><span>{{{labels.CBRT}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM7"><span>{{{labels.NUM7}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM8"><span>{{{labels.NUM8}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM9"><span>{{{labels.NUM9}}}</span></button>
-        <button class="key operator" data-command="term" data-param="DIV"><span>{{{labels.DIV}}}</span></button>
-    </div>
-    <div class="row">
-        <button class="key operator" data-command="term" data-param="POW NUM2"><span>{{{labels.POW2}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM4"><span>{{{labels.NUM4}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM5"><span>{{{labels.NUM5}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM6"><span>{{{labels.NUM6}}}</span></button>
-        <button class="key operator" data-command="term" data-param="MUL"><span>{{{labels.MUL}}}</span></button>
-    </div>
-    <div class="row">
-        <button class="key operator" data-command="term" data-param="POW NUM3"><span>{{{labels.POW3}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM1"><span>{{{labels.NUM1}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM2"><span>{{{labels.NUM2}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM3"><span>{{{labels.NUM3}}}</span></button>
-        <button class="key operator" data-command="term" data-param="SUB"><span>{{{labels.SUB}}}</span></button>
-    </div>
-    <div class="row">
-        <button class="key operator" data-command="term" data-param="POW"><span>{{{labels.POWY}}}</span></button>
-        <button class="key operand" data-command="term" data-param="NUM0"><span>{{{labels.NUM0}}}</span></button>
-        <button class="key operand" data-command="term" data-param="DOT"><span>{{{labels.DOT}}}</span></button>
-        <button class="key execute" data-command="execute"><span>{{{labels.EXECUTE}}}</span></button>
-        <button class="key operator" data-command="term" data-param="ADD"><span>{{{labels.SUB}}}</span></button>
-    </div>
+<div class="calculator-keyboard">
+    <div class="row">
+        <button class="key operator" data-command="term" data-param="SQRT"><span>{{{labels.SQRT}}}</span></button>
+        <button class="key operator" data-command="term" data-param="LPAR"><span>{{{labels.LPAR}}}</span></button>
+        <button class="key operator" data-command="term" data-param="RPAR"><span>{{{labels.RPAR}}}</span></button>
+        <button class="key command" data-command="clear"><span>{{{labels.CLEAR}}}</span></button>
+        <button class="key command" data-command="clearAll"><span>{{{labels.CLEARALL}}}</span></button>
+    </div>
+    <div class="row">
+        <button class="key operator" data-command="term" data-param="CBRT"><span>{{{labels.CBRT}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM7"><span>{{{labels.NUM7}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM8"><span>{{{labels.NUM8}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM9"><span>{{{labels.NUM9}}}</span></button>
+        <button class="key operator" data-command="term" data-param="DIV"><span>{{{labels.DIV}}}</span></button>
+    </div>
+    <div class="row">
+        <button class="key operator" data-command="term" data-param="POW NUM2"><span>{{{labels.POW2}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM4"><span>{{{labels.NUM4}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM5"><span>{{{labels.NUM5}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM6"><span>{{{labels.NUM6}}}</span></button>
+        <button class="key operator" data-command="term" data-param="MUL"><span>{{{labels.MUL}}}</span></button>
+    </div>
+    <div class="row">
+        <button class="key operator" data-command="term" data-param="POW NUM3"><span>{{{labels.POW3}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM1"><span>{{{labels.NUM1}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM2"><span>{{{labels.NUM2}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM3"><span>{{{labels.NUM3}}}</span></button>
+        <button class="key operator" data-command="term" data-param="SUB"><span>{{{labels.SUB}}}</span></button>
+    </div>
+    <div class="row">
+        <button class="key operator" data-command="term" data-param="POW"><span>{{{labels.POWY}}}</span></button>
+        <button class="key operand" data-command="term" data-param="NUM0"><span>{{{labels.NUM0}}}</span></button>
+        <button class="key operand" data-command="term" data-param="DOT"><span>{{{labels.DOT}}}</span></button>
+        <button class="key execute" data-command="execute"><span>{{{labels.EXECUTE}}}</span></button>
+        <button class="key operator" data-command="term" data-param="ADD"><span>{{{labels.SUB}}}</span></button>
+    </div>
 </div>