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

package/src/login/tpl/login.tpl

@@ -1,29 +1,29 @@
-<div class="xhtml_form login-component">
-    <form action="{{url}}" method="post" id="{{name}}" name="{{name}}">
-        <input type="hidden" class="global" name="{{name}}_sent" value="1">
-        {{#if message.error}}
-            <div class="xhtml_form_error">{{message.error}}</div>
-        {{/if}}
-        <div>
-            <label class="form_desc" for="login">
-                {{__ "Login"}}
-            </label><input type="text" name="login" id="login" {{#unless disableAutofocus}}autofocus="autofocus"{{/unless}} {{#if disableAutocomplete}} autocomplete="off"{{/if}} aria-required="true">
-            {{#if fieldMessages.login}}
-                <div class="form-error">
-                    {{fieldMessages.login}}
-                </div>
-            {{/if}}
-        </div>
-        <div>
-            <label class="form_desc" for="password">
-                {{__ "Password"}}
-            </label><input type="password" name="password" id="password"{{#if disableAutocomplete}} autocomplete="off"{{/if}} aria-required="true">
-            {{#if fieldMessages.password}}
-                <div class="form-error">
-                    {{fieldMessages.login}}
-                </div>
-            {{/if}}
-        </div>
-        <div class="form-toolbar"><input type="submit" id="connect" name="connect" disabled="disabled" class="disabled" value="{{__ "Log in"}}"></div>
-    </form>
-</div>
+<div class="xhtml_form login-component">
+    <form action="{{url}}" method="post" id="{{name}}" name="{{name}}">
+        <input type="hidden" class="global" name="{{name}}_sent" value="1">
+        {{#if message.error}}
+            <div class="xhtml_form_error">{{message.error}}</div>
+        {{/if}}
+        <div>
+            <label class="form_desc" for="login">
+                {{__ "Login"}}
+            </label><input type="text" name="login" id="login" {{#unless disableAutofocus}}autofocus="autofocus"{{/unless}} {{#if disableAutocomplete}} autocomplete="off"{{/if}} aria-required="true">
+            {{#if fieldMessages.login}}
+                <div class="form-error">
+                    {{fieldMessages.login}}
+                </div>
+            {{/if}}
+        </div>
+        <div>
+            <label class="form_desc" for="password">
+                {{__ "Password"}}
+            </label><input type="password" name="password" id="password"{{#if disableAutocomplete}} autocomplete="off"{{/if}} aria-required="true">
+            {{#if fieldMessages.password}}
+                <div class="form-error">
+                    {{fieldMessages.login}}
+                </div>
+            {{/if}}
+        </div>
+        <div class="form-toolbar"><input type="submit" id="connect" name="connect" disabled="disabled" class="disabled" value="{{__ "Log in"}}"></div>
+    </form>
+</div>

package/src/login/tpl/passwordReveal.tpl

@@ -1,7 +1,7 @@
-<span class="viewable-hiddenbox">
-    {{{elements}}}
-    <span class="viewable-hiddenbox-toggle">
-        <span aria-label="{{__ "Show password"}}" class="icon-preview" role="button" tabindex="0"></span>
-        <span aria-label="{{__ "Hide password"}}" class="icon-eye-slash" style="display: none;" role="button" tabindex="0"></span>
-    </span>
-</span>
+<span class="viewable-hiddenbox">
+    {{{elements}}}
+    <span class="viewable-hiddenbox-toggle">
+        <span aria-label="{{__ "Show password"}}" class="icon-preview" role="button" tabindex="0"></span>
+        <span aria-label="{{__ "Hide password"}}" class="icon-eye-slash" style="display: none;" role="button" tabindex="0"></span>
+    </span>
+</span>

package/src/maths/calculator/basicCalculator.js

@@ -1,55 +1,55 @@
-/**
- * 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 defaultCalculatorFactory from 'ui/maths/calculator/defaultCalculator';
-import keyboardTpl from 'ui/maths/calculator/tpl/basicKeyboard';
-import screenTpl from 'ui/maths/calculator/tpl/basicScreen';
-
-/**
- * Creates a basic 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 basicCalculatorFactory(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(
-            {
-                calculator: {
-                    plugins: {
-                        templateKeyboard: {
-                            layout: keyboardTpl
-                        },
-                        simpleScreen: {
-                            layout: screenTpl
-                        }
-                    }
-                }
-            },
-            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 defaultCalculatorFactory from 'ui/maths/calculator/defaultCalculator';
+import keyboardTpl from 'ui/maths/calculator/tpl/basicKeyboard';
+import screenTpl from 'ui/maths/calculator/tpl/basicScreen';
+
+/**
+ * Creates a basic 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 basicCalculatorFactory(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(
+            {
+                calculator: {
+                    plugins: {
+                        templateKeyboard: {
+                            layout: keyboardTpl
+                        },
+                        simpleScreen: {
+                            layout: screenTpl
+                        }
+                    }
+                }
+            },
+            config
+        )
+    );
+}

package/src/maths/calculator/calculatorComponent.js

@@ -1,128 +1,128 @@
-/**
- * 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-2019 Open Assessment Technologies SA ;
- */
-/**
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-import _ from 'lodash';
-import dynamicComponent from 'ui/dynamicComponent';
-import calculatorBoardFactory from 'ui/maths/calculator/core/board';
-import pluginsLoader from 'ui/maths/calculator/pluginsLoader';
-import 'ui/maths/calculator/css/calculator.css';
-
-/**
- * Default config values
- * @type {Object}
- */
-var defaultConfig = {
-    preserveAspectRatio: false,
-    width: 240,
-    height: 360,
-    minWidth: 190,
-    minHeight: 240,
-    alternativeTemplate: null
-};
-
-/**
- * Creates a dynamic panel containing a calculator.
- * @param {Object} config - Some config entries (@see ui/dynamicComponent)
- * @param {Object} [config.calculator] - Config for the calculator (@see ui/maths/calculator/core/board)
- * @param {Object} [config.loadedPlugins] - a collection of already loaded plugins
- * @param {Object} [config.dynamicPlugins] - a collection of plugins to load
- * @returns {dynamicComponent}
- */
-export default function calculatorComponentFactory(config) {
-    var calculator, calculatorComponent;
-
-    var api = {
-        /**
-         * Gets the nested calculator
-         * @returns {calculator}
-         */
-        getCalculator: function 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
-                                                )
-                                        );
-                                }
-                            })
-                                .setContentSize(
-                                    calculator.getElement().outerWidth(),
-                                    calculator.getElement().outerHeight()
-                                )
-                                .setState('ready')
-                                .trigger('ready');
-                            resolve();
-                        }
-                    );
-                });
-            });
-        })
-        .on('destroy', function() {
-            return new Promise(function(resolve) {
-                if (calculator) {
-                    calculator
-                        .after('destroy', function() {
-                            calculator = null;
-                            resolve();
-                        })
-                        .destroy();
-                } else {
-                    resolve();
-                }
-            });
-        });
-
-    _.defer(function() {
-        calculatorComponent.init(config);
-    });
-
-    return calculatorComponent;
-}
+/**
+ * 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-2019 Open Assessment Technologies SA ;
+ */
+/**
+ * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ */
+import _ from 'lodash';
+import dynamicComponent from 'ui/dynamicComponent';
+import calculatorBoardFactory from 'ui/maths/calculator/core/board';
+import pluginsLoader from 'ui/maths/calculator/pluginsLoader';
+import 'ui/maths/calculator/css/calculator.css';
+
+/**
+ * Default config values
+ * @type {Object}
+ */
+var defaultConfig = {
+    preserveAspectRatio: false,
+    width: 240,
+    height: 360,
+    minWidth: 190,
+    minHeight: 240,
+    alternativeTemplate: null
+};
+
+/**
+ * Creates a dynamic panel containing a calculator.
+ * @param {Object} config - Some config entries (@see ui/dynamicComponent)
+ * @param {Object} [config.calculator] - Config for the calculator (@see ui/maths/calculator/core/board)
+ * @param {Object} [config.loadedPlugins] - a collection of already loaded plugins
+ * @param {Object} [config.dynamicPlugins] - a collection of plugins to load
+ * @returns {dynamicComponent}
+ */
+export default function calculatorComponentFactory(config) {
+    var calculator, calculatorComponent;
+
+    var api = {
+        /**
+         * Gets the nested calculator
+         * @returns {calculator}
+         */
+        getCalculator: function 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
+                                                )
+                                        );
+                                }
+                            })
+                                .setContentSize(
+                                    calculator.getElement().outerWidth(),
+                                    calculator.getElement().outerHeight()
+                                )
+                                .setState('ready')
+                                .trigger('ready');
+                            resolve();
+                        }
+                    );
+                });
+            });
+        })
+        .on('destroy', function() {
+            return new Promise(function(resolve) {
+                if (calculator) {
+                    calculator
+                        .after('destroy', function() {
+                            calculator = null;
+                            resolve();
+                        })
+                        .destroy();
+                } else {
+                    resolve();
+                }
+            });
+        });
+
+    _.defer(function() {
+        calculatorComponent.init(config);
+    });
+
+    return calculatorComponent;
+}

package/src/maths/calculator/core/areaBroker.js

@@ -1,38 +1,38 @@
-/**
- * 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 (original work) Open Assessment Technologies SA ;
- */
-/**
- * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
- */
-import _ from 'lodash';
-import areaBroker from 'ui/areaBroker';
-
-/**
- * Creates an area broker with the required areas for the calculator panel.
- *
- * @see ui/areaBroker
- *
- * @param {jQuery|HTMLElement|String} $container - the main container
- * @param {Object} mapping - keys are the area names, values are jQueryElement
- * @returns {broker} the broker
- * @throws {TypeError} without a valid container
- */
-export default _.partial(areaBroker, [
-    'screen', // where the expressions and their result are rendered
-    'input', // where the expressions are input
-    'keyboard' // the keyboard area that should provide a way to interact with the calculator
-]);
+/**
+ * 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 (original work) Open Assessment Technologies SA ;
+ */
+/**
+ * @author Jean-Sébastien Conan <jean-sebastien@taotesting.com>
+ */
+import _ from 'lodash';
+import areaBroker from 'ui/areaBroker';
+
+/**
+ * Creates an area broker with the required areas for the calculator panel.
+ *
+ * @see ui/areaBroker
+ *
+ * @param {jQuery|HTMLElement|String} $container - the main container
+ * @param {Object} mapping - keys are the area names, values are jQueryElement
+ * @returns {broker} the broker
+ * @throws {TypeError} without a valid container
+ */
+export default _.partial(areaBroker, [
+    'screen', // where the expressions and their result are rendered
+    'input', // where the expressions are input
+    'keyboard' // the keyboard area that should provide a way to interact with the calculator
+]);