qms-angular 1.0.72 → 1.0.73

package/src/assets/qms-ckeditor-plugin/src/plugins/bpmn/qmsCKEditorBpmnPlugin.js

@@ -1,89 +1,26 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 import BpmnIcon from '../../themes/icons/bpmn.svg';
-import * as QMSCKEditorConstant from '../common/qmsCKEditorConstant';
-import * as QMSCKEditorService from '../common/qmsCKEditorService';
-import { IMAGEMAP_COMMANDS, createInsertedEvent } from '../imagemap/utils';
-import { debounced } from '../common/qmsCKEditorUtil';
-
+import BpmnDialogCommand from './bpmndialogcommand';
 export default class QMSCKEditorBpmnPlugin extends Plugin {
     init() {
         const editor = this.editor;
         const t = editor.t;
         editor.ui.componentFactory.add('qmsBpmn', locale => {
             const view = new ButtonView(locale);
-
+            const command = editor.commands.get('bpmnDialog');
             view.set({
                 label: t('Business Process Model and Notation'),
                 icon: BpmnIcon,
                 tooltip: true
             });
-
+            view.bind('isEnabled').to(command);
             view.on('execute', () => {
-              const isBpmn = this.isBpmnImage(editor.editing.view.document.selection.getSelectedElement(), editor.plugins.get('Image'))
-              if (isBpmn) {
-                const parentElement = editor.editing.view.document.selection.getSelectedElement();
-                const altAtr = parentElement.getChild(0).getAttribute('alt');
-                const arrAtr = altAtr.split("#");
-                const id = arrAtr[1];
-                QMSCKEditorService.bpmnNotify(id);
-              }
-              else {
-                QMSCKEditorService.bpmnNotify('');
-              }
-              window[QMSCKEditorConstant.QMSCK_BPMN_IS_PROCESSING] = false;
-              window.addEventListener(QMSCKEditorConstant.QMSCK_BPMN_PLUGIN_RESP, function (evt) {
-                if (window[QMSCKEditorConstant.QMSCK_BPMN_IS_PROCESSING]) {
-                    return;
-                }
-                window[QMSCKEditorConstant.QMSCK_BPMN_IS_PROCESSING] = true;
-                editor.model.change( writer => {
-                  const options = evt.detail.imagemap || {};
-                    const imageElement = writer.createElement( 'image', {
-                        src: evt.detail.values,
-                        alt: evt.detail.key
-                    });
-                    // Insert the image in the current selection location.
-                    editor.model.insertContent( imageElement, editor.model.document.selection );
-                    if(!!options.areas && options.areas.length > 0){
-                        editor.model.createSelection(imageElement, "in");//Set the current selection in the inserted image
-                        const imageMapCommand = editor.commands.get(IMAGEMAP_COMMANDS.IMAGEMAP);
-                        if(!!imageMapCommand){
-                          imageMapCommand.set('isEnabled', true);//force to run the command
-                          options.oldName = options.name;//Delete old image map if any
-                          imageMapCommand.execute(options);
-                          //resize image map when image width is greater than the widget width (600px)
-                          if(options.imageWidth > 600){
-                            const resizeImageMapCommand = editor.commands.get(IMAGEMAP_COMMANDS.RESIZE_IMAGEMAP);
-                            if(!!resizeImageMapCommand){
-                              imageMapCommand.once(createInsertedEvent(options.name), debounced(() => {
-                                  resizeImageMapCommand.set('isEnabled', true);//force to run the command
-                                  resizeImageMapCommand.execute();
-                              }, 500));
-                            }
-                          }
-                        }
-                    }
-                });
-              }, { once: true });
+              command.execute();
             });
             return view;
         });
-    }
-
-    isBpmnImage( element, image ) {
-      const isImage = element && image.isImageWidget( element );
-
-      if ( !isImage ) {
-        return false;
-      }
 
-      const altAtr = element.getChild(0).getAttribute('alt')
-      if (altAtr && altAtr.includes(QMSCKEditorConstant.QMSCK_BPMN)) {
-        return true;
-      }
-      else {
-        return false;
-      }
+        editor.commands.add('bpmnDialog', new BpmnDialogCommand(editor));
     }
 }

package/src/assets/qms-ckeditor-plugin/src/plugins/common/qmsCKEditorConstant.js

@@ -30,3 +30,7 @@ export const QMSCK_FLOWCHART_PLUGIN_RESP = 'QMSCK_FLOWCHART_PLUGIN_RESP';
 export const QMSCK_FLOWCHART = 'flowchart';
 /* Toolbar Toggle */
 export const QMSCK_TOGGLE_TOOLBAR_MSG = 'QMSCK_TOGGLE_TOOLBAR_MSG';
+/* Browse Video */
+export const QMSCK_BROWSE_VIDEO_MSG = 'QMSCK_BROWSE_VIDEO_MSG';
+export const QMSCK_BROWSE_VIDEO_RESP = 'QMSCK_BROWSE_VIDEO_RESP';
+export const QMSCK_BROWSE_VIDEO_IS_PROCESSING = 'QMSCK_BROWSE_VIDEO_IS_PROCESSING';

package/src/assets/qms-ckeditor-plugin/src/plugins/common/qmsCKEditorService.js

@@ -79,3 +79,24 @@ export function bpmnNotify(value) {
       '*'
   );
 }
+
+
+export function uploadVideoNotify(value) {
+    window.postMessage(
+        {
+            eventName: constant.QMSCK_BROWSE_VIDEO_MSG,
+            value
+        },
+        '*'
+    );
+}
+
+export function aboutCKEditorNotify(value) {
+  window.postMessage(
+      {
+          eventName: constant.QMSCK_ABOUT_CKEDITOR_PLUGIN_MSG,
+          value
+      },
+      '*'
+  );
+}

package/src/assets/qms-ckeditor-plugin/src/plugins/imagemap/imagemapcommand.js

@@ -90,3 +90,4 @@ export default class ImageMapCommand extends Command {
 		},{ once: true });
 	}
 }
+

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

@@ -219,7 +219,7 @@ export function drawMap(imageSrc, imageWidth, imageHeight, areas, callback){
 			}, false);
 		}
 		catch(err){
-
+			 console.log(err);
 		}
 	}
 }

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkcommand.js

@@ -11,8 +11,6 @@ import { Command } from '@ckeditor/ckeditor5-core';
 import { findAttributeRange } from '@ckeditor/ckeditor5-typing';
 import { Collection, first, toMap } from '@ckeditor/ckeditor5-utils';
 import * as QMSCKEditorConstant from '../common/qmsCKEditorConstant';
-import * as QMSCKEditorEnum from '../common/qmsCKEditorEnum';
-import * as QMSCKEditorService from '../common/qmsCKEditorService';
 import { isImageAllowed } from './utils';
 import AutomaticDecorators from './utils/automaticdecorators';
 
@@ -150,168 +148,143 @@ export default class LinkCommand extends Command {
 	 * @param {String} href Link destination.
 	 * @param {Object} [manualDecoratorIds={}] The information about manual decorator attributes to be applied or removed upon execution.
 	 */
-	execute() {
-
+	execute(options) {
         const model = this.editor.model;
         const selection = model.document.selection;
-        const ranges = selection.getFirstRange();
         const manualDecoratorIds = {};
         const linkDecorators = this.editor.config.get( 'link.decorators' );
         const selectedRange = 'link'+ linkDecorators.length;
+  
+		const url = options.url;
+		const href = url.substring(2, url.length);
+		const title = options.title ? options.title : url;
 
-        let link = QMSCKEditorEnum.hyperLink;
-        link.typeId = 0;
-        link.targetId = 0;
-        link.protocolId = 0;
-        link.url = '';
-        link.title = '';
-        link.editorContent = '';
-        for (const item of ranges.getItems()) {
-            if (item.data) {
-                link.title = item.data;
-            }
-        }
-        QMSCKEditorService.linkNotify(link);
-        window[QMSCKEditorConstant.QMSCK_LINKED] = false;
-        window.addEventListener(QMSCKEditorConstant.QMSCK_LINK_PLUGIN_RESP, function(evt) {
-            if (window[QMSCKEditorConstant.QMSCK_LINKED]){
-                return;
-            }
-            const response = evt.detail;
-            const target = QMSCKEditorEnum.protocolEnum[response.protocolId];
-            const url = response.url;
-            const href = url.substring(2, url.length);
-            const title = response.title ? response.title : url;
-
-            for(let i= 0; i < linkDecorators.length-2; i++){
-                manualDecoratorIds['link' + i] = (i === response.targetId)? true : false;
-            }
-            // Stores information about manual decorators to turn them on/off when command is applied.
-            const truthyManualDecorators = [];
-            const falsyManualDecorators = [];
-
-            for ( const name in manualDecoratorIds ) {
-                if ( manualDecoratorIds[ name ] ) {
-                    truthyManualDecorators.push( name );
-                } else {
-                    falsyManualDecorators.push( name );
-                }
-            }
-
-            model.change( writer => {
-                // set link option value
-                window[QMSCKEditorConstant.QMSCK_LINK_OPTION] = url.substring(0, 2);
-                // If selection is collapsed then update selected link or insert new one at the place of caret.
-                if ( selection.isCollapsed ) {
-                    const position = selection.getFirstPosition();
-
-                    // When selection is inside text with `linkHref` attribute.
-                    if ( selection.hasAttribute( 'linkHref' ) ) {
-                        // Then update `linkHref` value.
-                        const linkRange = findAttributeRange( position, 'linkHref', selection.getAttribute( 'linkHref' ), model );
-                        if (!selection.hasAttribute(selectedRange)) {
-                            writer.remove(linkRange);
-                            const newPosition = selection.getFirstPosition();
-                            const attributes = toMap( selection.getAttributes() );
-                            attributes.set( 'linkHref', href );
-                            truthyManualDecorators.forEach( item => {
-                                attributes.set( item, true );
-                            } );
-                            const { end: positionAfter } = model.insertContent( writer.createText( title, attributes ), newPosition );
-                            writer.setSelection( positionAfter );
-                        }
-                        else {
-                            writer.setAttribute( 'linkHref', href, linkRange );
-                            truthyManualDecorators.forEach( item => {
-                                writer.setAttribute( item, true, linkRange );
-                            } );
-                            falsyManualDecorators.forEach( item => {
-                                writer.removeAttribute( item, linkRange );
-                            } );
-                            // Put the selection at the end of the updated link.
-                            writer.setSelection( writer.createPositionAfter( linkRange.end.nodeBefore ) );
-                        }
-                    }
-                    // If not then insert text node with `linkHref` attribute in place of caret.
-                    // However, since selection is collapsed, attribute value will be used as data for text node.
-                    // So, if `href` is empty, do not create text node.
-                    else if ( href !== '' ) {
-                        const attributes = toMap( selection.getAttributes() );
-
-                        attributes.set( 'linkHref', href );
-
-                        truthyManualDecorators.forEach( item => {
-                            attributes.set( item, true );
-                        } );
-
-                        const { end: positionAfter } = model.insertContent( writer.createText( title, attributes ), position );
-
-                        // Put the selection at the end of the inserted link.
-                        // Using end of range returned from insertContent in case nodes with the same attributes got merged.
-                        writer.setSelection( positionAfter );
-                    }
-
-                    // Remove the `linkHref` attribute and all link decorators from the selection.
-                    // It stops adding a new content into the link element.
-                    [ 'linkHref', ...truthyManualDecorators, ...falsyManualDecorators ].forEach( item => {
-                        writer.removeSelectionAttribute( item );
-                    } );
-                } else {
-                    // If selection has non-collapsed ranges, we change attribute on nodes inside those ranges
-                    // omitting nodes where the `linkHref` attribute is disallowed.
-                    const ranges = model.schema.getValidRanges( selection.getRanges(), 'linkHref' );
-
-                    // But for the first, check whether the `linkHref` attribute is allowed on selected blocks (e.g. the "image" element).
-                    const allowedRanges = [];
-
-                    for ( const element of selection.getSelectedBlocks() ) {
-                        if ( model.schema.checkAttribute( element, 'linkHref' ) ) {
-                            allowedRanges.push( writer.createRangeOn( element ) );
-                        }
-                    }
-
-                    // Ranges that accept the `linkHref` attribute. Since we will iterate over `allowedRanges`, let's clone it.
-                    const rangesToUpdate = allowedRanges.slice();
-
-                    // eslint-disable-next-line max-len
-                    // For all selection ranges we want to check whether given range is inside an element that accepts the `linkHref` attribute.
-                    // If so, we don't want to propagate applying the attribute to its children.
-                    // for ( const range of ranges ) {
-                    //     if ( this._isRangeToUpdate( range, allowedRanges ) ) {
-                    //         rangesToUpdate.push( range );
-                    //     }
-                    // }
-
-                    for ( const range of ranges ) {
-                        const _isRangeToUpdate = true;
-                        for ( const allowedRange of allowedRanges ) {
-                            if ( allowedRange.containsRange( range ) ) {
-                                _isRangeToUpdate = false;
-                                break;
-                            }
-                        }
-                        if (_isRangeToUpdate) {
-                            rangesToUpdate.push( range );
-                        }
-                    }
-
-                    for ( const range of rangesToUpdate ) {
-                        writer.setAttribute('linkHref', href, range);
-                        writer.setAttribute(selectedRange, true, range);
-
-                        truthyManualDecorators.forEach( item => {
-                            writer.setAttribute( item, true, range );
-                        } );
-
-                        falsyManualDecorators.forEach( item => {
-                            writer.removeAttribute( item, range );
-                        } );
-                    }
-                }
-            } );
-            window[QMSCKEditorConstant.QMSCK_LINKED] = true;
-        },
-		{ once: true });
+		for(let i= 0; i < linkDecorators.length-2; i++){
+			manualDecoratorIds['link' + i] = (i === options.targetId)? true : false;
+		}
+		// Stores information about manual decorators to turn them on/off when command is applied.
+		const truthyManualDecorators = [];
+		const falsyManualDecorators = [];
+
+		for ( const name in manualDecoratorIds ) {
+			if ( manualDecoratorIds[ name ] ) {
+				truthyManualDecorators.push( name );
+			} else {
+				falsyManualDecorators.push( name );
+			}
+		}
+
+		model.change( writer => {
+			// set link option value
+			window[QMSCKEditorConstant.QMSCK_LINK_OPTION] = url.substring(0, 2);
+			// If selection is collapsed then update selected link or insert new one at the place of caret.
+			if ( selection.isCollapsed ) {
+				const position = selection.getFirstPosition();
+
+				// When selection is inside text with `linkHref` attribute.
+				if ( selection.hasAttribute( 'linkHref' ) ) {
+					// Then update `linkHref` value.
+					const linkRange = findAttributeRange( position, 'linkHref', selection.getAttribute( 'linkHref' ), model );
+					if (!selection.hasAttribute(selectedRange)) {
+						writer.remove(linkRange);
+						const newPosition = selection.getFirstPosition();
+						const attributes = toMap( selection.getAttributes() );
+						attributes.set( 'linkHref', href );
+						truthyManualDecorators.forEach( item => {
+							attributes.set( item, true );
+						} );
+						const { end: positionAfter } = model.insertContent( writer.createText( title, attributes ), newPosition );
+						writer.setSelection( positionAfter );
+					}
+					else {
+						writer.setAttribute( 'linkHref', href, linkRange );
+						truthyManualDecorators.forEach( item => {
+							writer.setAttribute( item, true, linkRange );
+						} );
+						falsyManualDecorators.forEach( item => {
+							writer.removeAttribute( item, linkRange );
+						} );
+						// Put the selection at the end of the updated link.
+						writer.setSelection( writer.createPositionAfter( linkRange.end.nodeBefore ) );
+					}
+				}
+				// If not then insert text node with `linkHref` attribute in place of caret.
+				// However, since selection is collapsed, attribute value will be used as data for text node.
+				// So, if `href` is empty, do not create text node.
+				else if ( href !== '' ) {
+					const attributes = toMap( selection.getAttributes() );
+
+					attributes.set( 'linkHref', href );
+
+					truthyManualDecorators.forEach( item => {
+						attributes.set( item, true );
+					} );
+
+					const { end: positionAfter } = model.insertContent( writer.createText( title, attributes ), position );
+
+					// Put the selection at the end of the inserted link.
+					// Using end of range returned from insertContent in case nodes with the same attributes got merged.
+					writer.setSelection( positionAfter );
+				}
+
+				// Remove the `linkHref` attribute and all link decorators from the selection.
+				// It stops adding a new content into the link element.
+				[ 'linkHref', ...truthyManualDecorators, ...falsyManualDecorators ].forEach( item => {
+					writer.removeSelectionAttribute( item );
+				} );
+			} else {
+				// If selection has non-collapsed ranges, we change attribute on nodes inside those ranges
+				// omitting nodes where the `linkHref` attribute is disallowed.
+				const ranges = model.schema.getValidRanges( selection.getRanges(), 'linkHref' );
+
+				// But for the first, check whether the `linkHref` attribute is allowed on selected blocks (e.g. the "image" element).
+				const allowedRanges = [];
+
+				for ( const element of selection.getSelectedBlocks() ) {
+					if ( model.schema.checkAttribute( element, 'linkHref' ) ) {
+						allowedRanges.push( writer.createRangeOn( element ) );
+					}
+				}
+
+				// Ranges that accept the `linkHref` attribute. Since we will iterate over `allowedRanges`, let's clone it.
+				const rangesToUpdate = allowedRanges.slice();
+
+				// eslint-disable-next-line max-len
+				// For all selection ranges we want to check whether given range is inside an element that accepts the `linkHref` attribute.
+				// If so, we don't want to propagate applying the attribute to its children.
+				// for ( const range of ranges ) {
+				//     if ( this._isRangeToUpdate( range, allowedRanges ) ) {
+				//         rangesToUpdate.push( range );
+				//     }
+				// }
+
+				for ( const range of ranges ) {
+					const _isRangeToUpdate = true;
+					for ( const allowedRange of allowedRanges ) {
+						if ( allowedRange.containsRange( range ) ) {
+							_isRangeToUpdate = false;
+							break;
+						}
+					}
+					if (_isRangeToUpdate) {
+						rangesToUpdate.push( range );
+					}
+				}
+
+				for ( const range of rangesToUpdate ) {
+					writer.setAttribute('linkHref', href, range);
+					writer.setAttribute(selectedRange, true, range);
+
+					truthyManualDecorators.forEach( item => {
+						writer.setAttribute( item, true, range );
+					} );
+
+					falsyManualDecorators.forEach( item => {
+						writer.removeAttribute( item, range );
+					} );
+				}
+			}
+		} );
 	}
 
 	/**
@@ -336,22 +309,4 @@ export default class LinkCommand extends Command {
 		return doc.selection.getAttribute( decoratorName );
 	}
 
-	/**
-	 * Checks whether specified `range` is inside an element that accepts the `linkHref` attribute.
-	 *
-	 * @private
-	 * @param {module:engine/view/range~Range} range A range to check.
-	 * @param {Array.<module:engine/view/range~Range>} allowedRanges An array of ranges created on elements where the attribute is accepted.
-	 * @returns {Boolean}
-	 */
-	_isRangeToUpdate( range, allowedRanges ) {
-		for ( const allowedRange of allowedRanges ) {
-			// A range is inside an element that will have the `linkHref` attribute. Do not modify its nodes.
-			if ( allowedRange.containsRange( range ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
 }

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkdialogcommand.js

@@ -0,0 +1,88 @@
+
+import { Command } from '@ckeditor/ckeditor5-core';
+import { Collection, first } from '@ckeditor/ckeditor5-utils';
+import * as QMSCKEditorConstant from '../common/qmsCKEditorConstant';
+import * as QMSCKEditorEnum from '../common/qmsCKEditorEnum';
+import * as QMSCKEditorService from '../common/qmsCKEditorService';
+import { isImageAllowed } from './utils';
+import AutomaticDecorators from './utils/automaticdecorators';
+  
+ export default class LinkDialogCommand extends Command {
+    constructor( editor ) {
+		super( editor );
+		this.manualDecorators = new Collection();
+		this.automaticDecorators = new AutomaticDecorators();
+	}
+ 
+	restoreManualDecoratorStates() {
+		for ( const manualDecorator of this.manualDecorators ) {
+			manualDecorator.value = this._getDecoratorStateFromModel( manualDecorator.id );
+		}
+	}
+ 
+	refresh() {
+		const model = this.editor.model;
+		const doc = model.document;
+
+		const selectedElement = first( doc.selection.getSelectedBlocks() );
+
+		// A check for the `LinkImage` plugin. If the selection contains an element, get values from the element.
+		// Currently the selection reads attributes from text nodes only. See #7429 and #7465.
+		if ( isImageAllowed( selectedElement, model.schema ) ) {
+			this.value = selectedElement.getAttribute( 'linkHref' );
+			this.isEnabled = model.schema.checkAttribute( selectedElement, 'linkHref' );
+		} else {
+			this.value = doc.selection.getAttribute( 'linkHref' );
+			this.isEnabled = model.schema.checkAttributeInSelection( doc.selection, 'linkHref' );
+		}
+
+		for ( const manualDecorator of this.manualDecorators ) {
+			manualDecorator.value = this._getDecoratorStateFromModel( manualDecorator.id );
+		}
+	}
+  
+     execute() {
+        const editor = this.editor;
+        const model = editor.model;
+        const selection = model.document.selection;
+        const ranges = selection.getFirstRange();
+
+        let link = QMSCKEditorEnum.hyperLink;
+        link.typeId = 0;
+        link.targetId = 0;
+        link.protocolId = 0;
+        link.url = '';
+        link.title = '';
+        link.editorContent = '';
+        for (const item of ranges.getItems()) {
+            if (item.data) {
+                link.title = item.data;
+            }
+        }
+        QMSCKEditorService.linkNotify(link);
+        window[QMSCKEditorConstant.QMSCK_LINKED] = false;
+        window.addEventListener(QMSCKEditorConstant.QMSCK_LINK_PLUGIN_RESP, function(evt) {
+            if (window[QMSCKEditorConstant.QMSCK_LINKED]){
+                return;
+            }
+			window[QMSCKEditorConstant.QMSCK_LINKED] = true;
+            const options = evt.detail;
+			editor.commands.get('link').execute(options);
+        }, { once: true });
+     }
+
+     _getDecoratorStateFromModel( decoratorName ) {
+		const model = this.editor.model;
+		const doc = model.document;
+		const selectedElement = first( doc.selection.getSelectedBlocks() );
+
+		// A check for the `LinkImage` plugin. If the selection contains an element, get values from the element.
+		// Currently the selection reads attributes from text nodes only. See #7429 and #7465.
+		if ( isImageAllowed( selectedElement, model.schema ) ) {
+			return selectedElement.getAttribute( decoratorName );
+		}
+
+		return doc.selection.getAttribute( decoratorName );
+	}
+ }
+ 

package/src/assets/qms-ckeditor-plugin/src/plugins/link/linkediting.js

@@ -20,6 +20,7 @@ import { createLinkElement, ensureSafeUrl, getLocalizedDecorators, normalizeDeco
 import * as QMSCKEditorConstant from '../common/qmsCKEditorConstant';
 import '../../themes/styles/link.css';
 import { isLinkElement } from './utils';
+import LinkDialogCommand  from './linkdialogcommand';
 
 const HIGHLIGHT_CLASS = 'ck-link_selected';
 const DECORATOR_AUTOMATIC = 'automatic';
@@ -94,6 +95,7 @@ export default class LinkEditing extends Plugin {
 
 		// Create linking commands.
 		editor.commands.add( 'link', new LinkCommand( editor ) );
+		editor.commands.add( 'linkdialog', new LinkDialogCommand( editor ) );
 		editor.commands.add( 'unlink', new UnlinkCommand( editor ) );
 
 		const linkDecorators = getLocalizedDecorators( editor.t, normalizeDecorators( editor.config.get( 'link.decorators' ) ) );