qms-angular 1.1.76 → 1.1.77

package/src/assets/qms-ckeditor-plugin/src/plugins/heading/headingui.js

@@ -45,8 +45,9 @@ export default class HeadingUI extends Plugin {
 
 			const headingCommand = editor.commands.get( 'heading' );
 			const paragraphCommand = editor.commands.get( 'paragraph' );
+			const ingressCommand = editor.commands.get( 'ingress' );
 
-			const commands = [ headingCommand ];
+			const commands = [ headingCommand, ingressCommand ];
 
 			for ( const option of options ) {
 				const def = {
@@ -58,10 +59,19 @@ export default class HeadingUI extends Plugin {
 					} )
 				};
 
-				if ( option.model === 'paragraph' ) {
-					def.model.bind( 'isOn' ).to( paragraphCommand, 'value' );
-					def.model.set( 'commandName', 'paragraph' );
-					commands.push( paragraphCommand );
+				if ( option.model === 'paragraph' || option.model === 'ingress' ) {
+					if(option.model === 'paragraph'){
+						def.model.bind( 'isOn' ).to( paragraphCommand, 'value' );
+						def.model.set( 'commandName', 'paragraph' );
+						commands.push( paragraphCommand );
+					}
+					if ( option.model === 'ingress' ) {
+						def.model.bind( 'isOn' ).to( ingressCommand, 'value', value => value === option.model );
+						def.model.set( {
+						commandName: 'ingress',
+						commandValue: option.model
+					} );
+					}
 				} else {
 					def.model.bind( 'isOn' ).to( headingCommand, 'value', value => value === option.model );
 					def.model.set( {
@@ -97,12 +107,12 @@ export default class HeadingUI extends Plugin {
 				return areEnabled.some( isEnabled => isEnabled );
 			} );
 
-			dropdownView.buttonView.bind( 'label' ).to( headingCommand, 'value', paragraphCommand, 'value', ( value, para ) => {
-				const whichModel = value || para && 'paragraph';
+			dropdownView.buttonView.bind( 'label' ).to( headingCommand, 'value', paragraphCommand, 'value',ingressCommand, 'value', ( head, para, ingrs ) => {
+				const whichModel = head || ingrs && 'ingress' || para && 'paragraph';
 				// If none of the commands is active, display default title.
 				return titles[ whichModel ] ? titles[ whichModel ] : defaultTitle;
 			} );
-
+			
 			// Execute command when an item from the dropdown is selected.
 			this.listenTo( dropdownView, 'execute', evt => {
 				editor.execute( evt.source.commandName, evt.source.commandValue ? { value: evt.source.commandValue } : undefined );

package/src/assets/qms-ckeditor-plugin/src/plugins/heading/ingress/ingress.js

@@ -0,0 +1,63 @@
+import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import IngressCommand from './ingresscommand';
+
+export default class Ingress extends Plugin {
+  
+    static get pluginName() {
+        return 'Ingress';
+    }
+
+    init() {
+        const editor = this.editor;
+        const model = editor.model;
+
+        editor.commands.add( 'ingress', new IngressCommand( editor ) );
+
+        // Schema.
+        model.schema.register( 'ingress', { inheritAllFrom: '$block' } );
+        editor.conversion.elementToElement( { model: 'ingress', view: 'p' } );
+
+        // Conversion for paragraph-like elements which has not been converted by any plugin.
+        // editor.conversion.for( 'upcast' ).elementToElement( {
+        //     model: ( viewElement, { writer } ) => {
+        //         if ( !Ingress.paragraphLikeElements.has( viewElement.name ) ) {
+        //             return null;
+        //         }
+
+        //         // Do not auto-paragraph empty elements.
+        //         if ( viewElement.isEmpty ) {
+        //             return null;
+        //         }
+
+        //         return writer.createElement( 'ingress' );
+        //     },
+        //     view: /.+/,
+        //     converterPriority: 'low'
+        // } );
+
+        editor.conversion.for( 'downcast' ).add( dispatcher => {
+			dispatcher.on( 'insert:ingress', ( evt, data, conversionApi ) => {
+				const viewWriter = conversionApi.writer;
+	
+				viewWriter.addClass( 'radEdIngress', conversionApi.mapper.toViewElement( data.item ) );
+			}, { priority: 'low' } );
+		} );
+    }
+}
+
+Ingress.paragraphLikeElements = new Set( [
+    'blockquote',
+    'dd',
+    'div',
+    'dt',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'li',
+    'p',
+    'td',
+    'th'
+] );

package/src/assets/qms-ckeditor-plugin/src/plugins/heading/ingress/ingresscommand.js

@@ -0,0 +1,33 @@
+import Command from '@ckeditor/ckeditor5-core/src/command';
+import first from '@ckeditor/ckeditor5-utils/src/first';
+
+
+export default class IngressCommand extends Command {
+    refresh() {
+        const model = this.editor.model;
+        const document = model.document;
+        const block = first( document.selection.getSelectedBlocks() );
+
+        this.value = !!block && block.is( 'element', 'ingress' );
+        this.isEnabled = !!block && checkCanBecomeIngress( block, model.schema );
+    }
+    
+    execute( options = {} ) {
+        const model = this.editor.model;
+        const document = model.document;
+
+        model.change( writer => {
+            const blocks = ( options.selection || document.selection ).getSelectedBlocks();
+
+            for ( const block of blocks ) {
+                if ( !block.is( 'element', 'ingress' ) && checkCanBecomeIngress( block, model.schema ) ) {
+                    writer.rename( block, 'ingress' );
+                }
+            }
+        } );
+    }
+}
+
+function checkCanBecomeIngress( block, schema ) {
+    return schema.checkChild( block.parent, 'ingress' ) && !schema.isObject( block );
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/heading/theme/heading.css

@@ -1,35 +1,44 @@
-/*
- * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-.ck.ck-heading_heading1 {
-	font-size: 20px;
-}
-
-.ck.ck-heading_heading2 {
-	font-size: 17px;
-}
-
-.ck.ck-heading_heading3 {
-	font-size: 14px;
-}
-
-.ck[class*="ck-heading_heading"] {
-	font-weight: bold;
-}
-
-.ck h1.radEdH1{
-	font: bold 14pt Cambria, sans-serif;
-    color: #003388;
-}
-
-.ck h2.radEdH2{
-	font: bold 13pt Cambria, sans-serif;
-    color: #003388;
-}
-
-.ck h3.radEdH3{
-	font: bold 12pt Cambria, sans-serif;
-    color: #003388;
-}
+/*
+ * Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+.ck.ck-heading_heading1 {
+	font-size: 20px;
+}
+
+.ck.ck-heading_heading2 {
+	font-size: 17px;
+}
+
+.ck.ck-heading_heading3 {
+	font-size: 14px;
+}
+
+.ck[class*="ck-heading_heading"] {
+	font-weight: bold;
+}
+
+.ck h1.radEdH1{
+	font: bold 14pt Cambria, sans-serif;
+    color: #003388;
+}
+
+.ck h2.radEdH2{
+	font: bold 13pt Cambria, sans-serif;
+    color: #003388;
+}
+
+.ck h3.radEdH3{
+	font: bold 12pt Cambria, sans-serif;
+    color: #003388;
+}
+
+.ck .ck-heading_ingress {
+	font-size: 20px !important;
+	font-weight: bold;
+}
+
+.radEdIngress{
+	font: bold 14pt Cambria, sans-serif;
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/heading/utils.js

@@ -21,7 +21,8 @@
 export function getLocalizedOptions( editor ) {
 	const t = editor.t;
 	const localizedTitles = {
-		Paragraph: t( 'Paragraph' ),
+		Paragraph: t( 'Default' ),
+		Ingress: t( 'Ingress' ),
 		'Heading 1': t( 'Heading %0', '1' ),
 		'Heading 2': t( 'Heading %0', '2' ),
 		'Heading 3': t( 'Heading %0', '3' ),

package/src/assets/qms-ckeditor-plugin/src/plugins/table/commands/setheadercolumncommand.js

@@ -1,95 +1,99 @@
-/**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @module table/commands/setheadercolumncommand
- */
-
-import { Command } from 'ckeditor5/src/core';
-
-import {
-	isHeadingColumnCell,
-	updateNumericAttribute
-} from '../utils/common';
-import { getColumnIndexes, getSelectionAffectedTableCells } from '../utils/selection';
-import { getHorizontallyOverlappingCells, splitVertically } from '../utils/structure';
-
-/**
- * The header column command.
- *
- * The command is registered by {@link module:table/tableediting~TableEditing} as the `'setTableColumnHeader'` editor command.
- *
- * You can make the column containing the selected cell a [header](https://www.w3.org/TR/html50/tabular-data.html#the-th-element)
- * by executing:
- *
- *		editor.execute( 'setTableColumnHeader' );
- *
- * **Note:** All preceding columns will also become headers. If the current column is already a header, executing this command
- * will make it a regular column back again (including the following columns).
- *
- * @extends module:core/command~Command
- */
-export default class SetHeaderColumnCommand extends Command {
-	/**
-	 * @inheritDoc
-	 */
-	refresh() {
-		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
-		const tableUtils = this.editor.plugins.get( 'TableUtils' );
-		const isInTable = selectedCells.length > 0;
-
-		this.isEnabled = isInTable;
-
-		/**
-		 * Flag indicating whether the command is active. The command is active when the
-		 * {@link module:engine/model/selection~Selection} is in a header column.
-		 *
-		 * @observable
-		 * @readonly
-		 * @member {Boolean} #value
-		 */
-		this.value = isInTable && selectedCells.every( cell => isHeadingColumnCell( tableUtils, cell ) );
-	}
-
-	/**
-	 * Executes the command.
-	 *
-	 * When the selection is in a non-header column, the command will set the `headingColumns` table attribute to cover that column.
-	 *
-	 * When the selection is already in a header column, it will set `headingColumns` so the heading section will end before that column.
-	 *
-	 * @fires execute
-	 * @param {Object} [options]
-	 * @param {Boolean} [options.forceValue] If set, the command will set (`true`) or unset (`false`) the header columns according to
-	 * the `forceValue` parameter instead of the current model state.
-	 */
-	execute( options = {} ) {
-		if ( options.forceValue === this.value ) {
-			return;
-		}
-
-		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
-		const table = selectedCells[ 0 ].findAncestor( 'table' );
-
-		const { first, last } = getColumnIndexes( selectedCells );
-		const headingColumnsToSet = this.value ? first : last + 1;
-
-		model.change( writer => {
-			if ( headingColumnsToSet ) {
-				// Changing heading columns requires to check if any of a heading cell is overlapping horizontally the table head.
-				// Any table cell that has a colspan attribute > 1 will not exceed the table head so we need to fix it in columns before.
-				const overlappingCells = getHorizontallyOverlappingCells( table, headingColumnsToSet );
-
-				for ( const { cell, column } of overlappingCells ) {
-					splitVertically( cell, column, headingColumnsToSet, writer );
-				}
-			}
-
-			updateNumericAttribute( 'headingColumns', headingColumnsToSet, table, writer, 0 );
-		} );
-	}
-}
+/**
+ * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @module table/commands/setheadercolumncommand
+ */
+
+import { Command } from 'ckeditor5/src/core';
+
+import {
+	isHeadingColumnCell,
+	updateNumericAttribute
+} from '../utils/common';
+import { getColumnIndexes, getSelectionAffectedTableCells } from '../utils/selection';
+import { getHorizontallyOverlappingCells, splitVertically } from '../utils/structure';
+
+/**
+ * The header column command.
+ *
+ * The command is registered by {@link module:table/tableediting~TableEditing} as the `'setTableColumnHeader'` editor command.
+ *
+ * You can make the column containing the selected cell a [header](https://www.w3.org/TR/html50/tabular-data.html#the-th-element)
+ * by executing:
+ *
+ *		editor.execute( 'setTableColumnHeader' );
+ *
+ * **Note:** All preceding columns will also become headers. If the current column is already a header, executing this command
+ * will make it a regular column back again (including the following columns).
+ *
+ * @extends module:core/command~Command
+ */
+export default class SetHeaderColumnCommand extends Command {
+	/**
+	 * @inheritDoc
+	 */
+	refresh() {
+		const model = this.editor.model;
+		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const isInTable = selectedCells.length > 0;
+
+		this.isEnabled = isInTable;
+
+		/**
+		 * Flag indicating whether the command is active. The command is active when the
+		 * {@link module:engine/model/selection~Selection} is in a header column.
+		 *
+		 * @observable
+		 * @readonly
+		 * @member {Boolean} #value
+		 */
+		this.value = isInTable && selectedCells.every( cell => isHeadingColumnCell( tableUtils, cell ) );
+	}
+
+	/**
+	 * Executes the command.
+	 *
+	 * When the selection is in a non-header column, the command will set the `headingColumns` table attribute to cover that column.
+	 *
+	 * When the selection is already in a header column, it will set `headingColumns` so the heading section will end before that column.
+	 *
+	 * @fires execute
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.forceValue] If set, the command will set (`true`) or unset (`false`) the header columns according to
+	 * the `forceValue` parameter instead of the current model state.
+	 */
+	execute( options = {} ) {
+		if ( options.forceValue === this.value ) {
+			return;
+		}
+
+		const model = this.editor.model;
+		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const table = selectedCells[ 0 ].findAncestor( 'table' );
+
+		const { first, last } = getColumnIndexes( selectedCells );
+		const headingColumnsToSet = this.value ? first : last + 1;
+
+		model.change( writer => {
+			if(headingColumnsToSet > 1){
+				return;
+			}
+
+			if ( headingColumnsToSet ) {
+				// Changing heading columns requires to check if any of a heading cell is overlapping horizontally the table head.
+				// Any table cell that has a colspan attribute > 1 will not exceed the table head so we need to fix it in columns before.
+				const overlappingCells = getHorizontallyOverlappingCells( table, headingColumnsToSet );
+
+				for ( const { cell, column } of overlappingCells ) {
+					splitVertically( cell, column, headingColumnsToSet, writer );
+				}
+			}
+
+			updateNumericAttribute( 'headingColumns', headingColumnsToSet, table, writer, 0 );
+		} );
+	}
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/table/commands/setheaderrowcommand.js

@@ -1,105 +1,110 @@
-/**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-/**
- * @module table/commands/setheaderrowcommand
- */
-
-import { Command } from 'ckeditor5/src/core';
-
-import { updateNumericAttribute } from '../utils/common';
-import { getRowIndexes, getSelectionAffectedTableCells } from '../utils/selection';
-import { getVerticallyOverlappingCells, splitHorizontally } from '../utils/structure';
-
-/**
- * The header row command.
- *
- * The command is registered by {@link module:table/tableediting~TableEditing} as the `'setTableColumnHeader'` editor command.
- *
- * You can make the row containing the selected cell a [header](https://www.w3.org/TR/html50/tabular-data.html#the-th-element) by executing:
- *
- *		editor.execute( 'setTableRowHeader' );
- *
- * **Note:** All preceding rows will also become headers. If the current row is already a header, executing this command
- * will make it a regular row back again (including the following rows).
- *
- * @extends module:core/command~Command
- */
-export default class SetHeaderRowCommand extends Command {
-	/**
-	 * @inheritDoc
-	 */
-	refresh() {
-		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
-		const isInTable = selectedCells.length > 0;
-
-		this.isEnabled = isInTable;
-
-		/**
-		 * Flag indicating whether the command is active. The command is active when the
-		 * {@link module:engine/model/selection~Selection} is in a header row.
-		 *
-		 * @observable
-		 * @readonly
-		 * @member {Boolean} #value
-		 */
-		this.value = isInTable && selectedCells.every( cell => this._isInHeading( cell, cell.parent.parent ) );
-	}
-
-	/**
-	 * Executes the command.
-	 *
-	 * When the selection is in a non-header row, the command will set the `headingRows` table attribute to cover that row.
-	 *
-	 * When the selection is already in a header row, it will set `headingRows` so the heading section will end before that row.
-	 *
-	 * @fires execute
-	 * @param {Object} options
-	 * @param {Boolean} [options.forceValue] If set, the command will set (`true`) or unset (`false`) the header rows according to
-	 * the `forceValue` parameter instead of the current model state.
-	 */
-	execute( options = {} ) {
-		if ( options.forceValue === this.value ) {
-			return;
-		}
-		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
-		const table = selectedCells[ 0 ].findAncestor( 'table' );
-
-		const { first, last } = getRowIndexes( selectedCells );
-		const headingRowsToSet = this.value ? first : last + 1;
-		const currentHeadingRows = table.getAttribute( 'headingRows' ) || 0;
-
-		model.change( writer => {
-			if ( headingRowsToSet ) {
-				// Changing heading rows requires to check if any of a heading cell is overlapping vertically the table head.
-				// Any table cell that has a rowspan attribute > 1 will not exceed the table head so we need to fix it in rows below.
-				const startRow = headingRowsToSet > currentHeadingRows ? currentHeadingRows : 0;
-				const overlappingCells = getVerticallyOverlappingCells( table, headingRowsToSet, startRow );
-
-				for ( const { cell } of overlappingCells ) {
-					splitHorizontally( cell, headingRowsToSet, writer );
-				}
-			}
-
-			updateNumericAttribute( 'headingRows', headingRowsToSet, table, writer, 0 );
-		} );
-	}
-
-	/**
-	 * Checks if a table cell is in the heading section.
-	 *
-	 * @param {module:engine/model/element~Element} tableCell
-	 * @param {module:engine/model/element~Element} table
-	 * @returns {Boolean}
-	 * @private
-	 */
-	_isInHeading( tableCell, table ) {
-		const headingRows = parseInt( table.getAttribute( 'headingRows' ) || 0 );
-
-		return !!headingRows && tableCell.parent.index < headingRows;
-	}
-}
+/**
+ * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @module table/commands/setheaderrowcommand
+ */
+
+import { Command } from 'ckeditor5/src/core';
+
+import { updateNumericAttribute } from '../utils/common';
+import { getRowIndexes, getSelectionAffectedTableCells } from '../utils/selection';
+import { getVerticallyOverlappingCells, splitHorizontally } from '../utils/structure';
+
+/**
+ * The header row command.
+ *
+ * The command is registered by {@link module:table/tableediting~TableEditing} as the `'setTableColumnHeader'` editor command.
+ *
+ * You can make the row containing the selected cell a [header](https://www.w3.org/TR/html50/tabular-data.html#the-th-element) by executing:
+ *
+ *		editor.execute( 'setTableRowHeader' );
+ *
+ * **Note:** All preceding rows will also become headers. If the current row is already a header, executing this command
+ * will make it a regular row back again (including the following rows).
+ *
+ * @extends module:core/command~Command
+ */
+export default class SetHeaderRowCommand extends Command {
+	/**
+	 * @inheritDoc
+	 */
+	refresh() {
+		const model = this.editor.model;
+		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const isInTable = selectedCells.length > 0;
+
+		this.isEnabled = isInTable;
+
+		/**
+		 * Flag indicating whether the command is active. The command is active when the
+		 * {@link module:engine/model/selection~Selection} is in a header row.
+		 *
+		 * @observable
+		 * @readonly
+		 * @member {Boolean} #value
+		 */
+		this.value = isInTable && selectedCells.every( cell => this._isInHeading( cell, cell.parent.parent ) );
+	}
+
+	/**
+	 * Executes the command.
+	 *
+	 * When the selection is in a non-header row, the command will set the `headingRows` table attribute to cover that row.
+	 *
+	 * When the selection is already in a header row, it will set `headingRows` so the heading section will end before that row.
+	 *
+	 * @fires execute
+	 * @param {Object} options
+	 * @param {Boolean} [options.forceValue] If set, the command will set (`true`) or unset (`false`) the header rows according to
+	 * the `forceValue` parameter instead of the current model state.
+	 */
+	execute( options = {} ) {
+		if ( options.forceValue === this.value ) {
+			return;
+		}
+		const model = this.editor.model;
+		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const table = selectedCells[ 0 ].findAncestor( 'table' );
+
+		const { first, last } = getRowIndexes( selectedCells );
+		const headingRowsToSet = this.value ? first : last + 1; // Only first row, origin is last + 1
+		const currentHeadingRows = table.getAttribute( 'headingRows' ) || 0;
+
+		model.change( writer => {
+
+			if(headingRowsToSet > 1){
+				return;
+			}
+
+			if ( headingRowsToSet ) {
+				// Changing heading rows requires to check if any of a heading cell is overlapping vertically the table head.
+				// Any table cell that has a rowspan attribute > 1 will not exceed the table head so we need to fix it in rows below.
+				const startRow = headingRowsToSet > currentHeadingRows ? currentHeadingRows : 0;
+				const overlappingCells = getVerticallyOverlappingCells( table, headingRowsToSet, startRow );
+
+				for ( const { cell } of overlappingCells ) {
+					splitHorizontally( cell, headingRowsToSet, writer );
+				}
+			}
+
+			updateNumericAttribute( 'headingRows', headingRowsToSet, table, writer, 0 );
+		} );
+	}
+
+	/**
+	 * Checks if a table cell is in the heading section.
+	 *
+	 * @param {module:engine/model/element~Element} tableCell
+	 * @param {module:engine/model/element~Element} table
+	 * @returns {Boolean}
+	 * @private
+	 */
+	_isInHeading( tableCell, table ) {
+		const headingRows = parseInt( table.getAttribute( 'headingRows' ) || 0 );
+	
+		return !!headingRows && tableCell.parent.index < headingRows;
+	}
+}