@oat-sa/tao-core-ui 1.57.0 → 1.58.2

package/dist/ckeditor/ckConfigurator.js

@@ -26,24 +26,24 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
      * Cache original config
      */
 
-    const originalConfig = _.cloneDeep(window.CKEDITOR.config);
+    var originalConfig = _.cloneDeep(window.CKEDITOR.config);
 
-    const moduleConfig = module.config();
+    var moduleConfig = module.config();
 
     function getUserLanguage() {
-      const documentLang = window.document.documentElement.getAttribute('lang');
-      const documentLocale = documentLang && documentLang.split('-')[0];
+      var documentLang = window.document.documentElement.getAttribute('lang');
+      var documentLocale = documentLang && documentLang.split('-')[0];
       return documentLocale;
     }
 
-    const lang = getUserLanguage();
+    var lang = getUserLanguage();
 
-    const ckConfigurator = function () {
+    var ckConfigurator = function () {
       /**
        * Toolbar presets that you normally never would need to change, they can however be overridden with options.toolbar.
        * The argument 'toolbarType' determines which toolbar to use
        */
-      const toolbarPresets = {
+      var toolbarPresets = {
         inline: [{
           name: 'basicstyles',
           items: ['Bold', 'Italic', 'Subscript', 'Superscript']
@@ -53,6 +53,9 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }, {
           name: 'links',
           items: ['Link']
+        }, {
+          name: 'language',
+          items: ['Language']
         }],
         flow: [{
           name: 'basicstyles',
@@ -63,6 +66,9 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }, {
           name: 'links',
           items: ['Link']
+        }, {
+          name: 'language',
+          items: ['Language']
         }],
         block: [{
           name: 'basicstyles',
@@ -73,6 +79,9 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }, {
           name: 'links',
           items: ['Link']
+        }, {
+          name: 'language',
+          items: ['Language']
         }, {
           name: 'styles',
           items: ['Format']
@@ -129,6 +138,9 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }, {
           name: 'insert',
           items: ['Link', 'SpecialChar']
+        }, {
+          name: 'language',
+          items: ['Language']
         }],
         table: [{
           name: 'basicstyles',
@@ -142,18 +154,21 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }, {
           name: 'paragraph',
           items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']
+        }, {
+          name: 'language',
+          items: ['Language']
         }]
       };
       /**
        * defaults for editor configuration
        */
 
-      const ckConfigDefault = {
+      var ckConfigDefault = {
         disableAutoInline: true,
         entities: false,
         entities_processNumerical: true,
         autoParagraph: false,
-        extraPlugins: 'confighelper',
+        extraPlugins: 'confighelper, taolanguage',
         floatSpaceDockedOffsetY: 0,
         forcePasteAsPlainText: true,
         skin: 'tao',
@@ -189,8 +204,8 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
        */
 
 
-      const _updatePlugins = function (ckConfig, positionedPlugins) {
-        let itCnt,
+      var _updatePlugins = function _updatePlugins(ckConfig, positionedPlugins) {
+        var itCnt,
             tbCnt = ckConfig.toolbar.length,
             itLen,
             method,
@@ -205,8 +220,8 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         positionedPlugins = positionedPlugins || {}; // add positioned plugins to extraPlugins and let CKEDITOR take care of their registration
 
         ckConfig.extraPlugins = function (positionedPluginArr, extraPlugins) {
-          let pluginIndex = positionedPluginArr.length;
-          let extraPluginArr = extraPlugins.split(',');
+          var pluginIndex = positionedPluginArr.length;
+          var extraPluginArr = extraPlugins.split(',');
 
           while (pluginIndex--) {
             positionedPluginArr[pluginIndex] = positionedPluginArr[pluginIndex].toLowerCase();
@@ -230,7 +245,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
 
         for (plugin in positionedPlugins) {
           method = function (pluginProps) {
-            let propIndex = pluginProps.length;
+            var propIndex = pluginProps.length;
 
             while (propIndex--) {
               if (pluginProps[propIndex].indexOf('insert') === 0 || pluginProps[propIndex] === 'replace') {
@@ -284,7 +299,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }
       };
 
-      const _switchDtd = function _switchDtd(dtdMode) {
+      var _switchDtd = function _switchDtd(dtdMode) {
         dtdHandler.setMode(dtdMode);
         window.CKEDITOR.dtd = dtdHandler.getDtd();
       };
@@ -304,18 +319,19 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
        * @param {Boolean} [options.underline] - enables the underline plugin
        * @param {Boolean} [options.highlight] - enables the highlight plugin
        * @param {Boolean} [options.mathJax] - enables the mathJax plugin
+       * @param {Boolean} [options.horizontalRule] - enables the horizontalRule plugin
        * @param {String} [options.removePlugins] - a coma-separated list of plugins that should not be loaded: 'plugin1,plugin2,plugin3'
        *
        * @see http://docs.ckeditor.com/#!/api/CKEDITOR.config
        */
 
 
-      const getConfig = function (editor, toolbarType, options) {
-        let toolbar, toolbars, config, dtdMode; // This is different from CKEDITOR.config.extraPlugins since it also allows to position the button
+      var getConfig = function getConfig(editor, toolbarType, options) {
+        var toolbar, toolbars, config, dtdMode; // This is different from CKEDITOR.config.extraPlugins since it also allows to position the button
         // Valid positioning keys are insertAfter | insertBefore | replace followed by the button name, e.g. 'Anchor'
         // separator bool, defaults to false
 
-        let positionedPlugins = {};
+        var positionedPlugins = {};
 
         if (toolbarType === 'reset') {
           return originalConfig;
@@ -326,7 +342,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         toolbars = _.clone(toolbarPresets, true);
         dtdMode = options.dtdMode || 'html';
 
-        const ckConfig = _.clone(ckConfigDefault, true); // modify DTD to either comply with QTI or XHTML
+        var ckConfig = _.clone(ckConfigDefault, true); // modify DTD to either comply with QTI or XHTML
 
 
         if (dtdMode === 'qti' || toolbarType.indexOf('qti') === 0) {
@@ -380,6 +396,12 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
               insertAfter: 'SpecialChar'
             };
           }
+
+          if (options.horizontalRule && ['block', 'inline'].includes(toolbarType)) {
+            positionedPlugins.HorizontalRule = {
+              insertAfter: 'TaoTooltip'
+            };
+          }
         } // if there is a toolbar in the options add it to the set
 
 
@@ -430,7 +452,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'module'], fun
         }); // This fixes bug #2855. Unfortunately this can be done on the global object only, not on the instance
 
         window.CKEDITOR.on('dialogDefinition', function (e) {
-          let linkTypes, wanted, linkIndex;
+          var linkTypes, wanted, linkIndex;
 
           if (e.data.name !== 'link') {
             return;

package/dist/ckeditor/dtdHandler.js

@@ -31,7 +31,7 @@ define(['lodash'], function (_) { 'use strict';
        * Set DTD mode (qti|html)
        */
 
-      var setMode = function (mode) {
+      var setMode = function setMode(mode) {
         // for the oblivious ones such as myself:
         if (mode.toLowerCase() === 'xhtml') {
           mode = 'html';
@@ -58,7 +58,7 @@ define(['lodash'], function (_) { 'use strict';
        * @returns {Array}
        */
 
-      var getParentsOf = function (child) {
+      var getParentsOf = function getParentsOf(child) {
         var parents = [],
             element;
         child = _normalizeElement(child);
@@ -87,7 +87,7 @@ define(['lodash'], function (_) { 'use strict';
        */
 
 
-      var getChildrenOf = function (parent) {
+      var getChildrenOf = function getChildrenOf(parent) {
         parent = _normalizeElement(parent);
 
         if (parent in dtds[dtdMode]) {
@@ -105,7 +105,7 @@ define(['lodash'], function (_) { 'use strict';
        */
 
 
-      var isChildOf = function (child, of) {
+      var isChildOf = function isChildOf(child, of) {
         return _.contains(getChildrenOf(of), _normalizeElement(child));
       };
       /**
@@ -117,7 +117,7 @@ define(['lodash'], function (_) { 'use strict';
        */
 
 
-      var isParentOf = function (parent, of) {
+      var isParentOf = function isParentOf(parent, of) {
         return _.contains(getParentsOf(of), _normalizeElement(parent));
       };
       /**
@@ -127,7 +127,7 @@ define(['lodash'], function (_) { 'use strict';
        */
 
 
-      var getDtd = function () {
+      var getDtd = function getDtd() {
         return dtds[dtdMode];
       };
       /**
@@ -137,7 +137,7 @@ define(['lodash'], function (_) { 'use strict';
        */
 
 
-      var getMode = function () {
+      var getMode = function getMode() {
         return dtdMode;
       };
       /**
@@ -177,7 +177,7 @@ define(['lodash'], function (_) { 'use strict';
 
       dtds.html = function () {
         var X = _.extend,
-            Y = function (source, removed) {
+            Y = function Y(source, removed) {
           var substracted = _.cloneDeep(source),
               i,
               name;
@@ -185,7 +185,9 @@ define(['lodash'], function (_) { 'use strict';
           for (i = 1; i < arguments.length; i++) {
             removed = arguments[i];
 
-            for (name in removed) delete substracted[name];
+            for (name in removed) {
+              delete substracted[name];
+            }
           }
 
           return substracted;