qms-angular 1.1.35 → 1.1.36

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

@@ -149,6 +149,10 @@ export default class LinkCommand extends Command {
 	 * @param {Object} [manualDecoratorIds={}] The information about manual decorator attributes to be applied or removed upon execution.
 	 */
 	execute(options) {
+		if(!options) {
+			return;
+		}
+
 		const model = this.editor.model;
 		const selection = model.document.selection;
 		const manualDecoratorIds = {};

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

@@ -4,9 +4,10 @@ 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 { isImageAllowed, isLinkElement} from './utils';
 import AutomaticDecorators from './utils/automaticdecorators';
-  
+import * as QMSCKEditorUtil from '../common/qmsCKEditorUtil';
+
  export default class LinkDialogCommand extends Command {
     constructor( editor ) {
 		super( editor );
@@ -48,18 +49,38 @@ import AutomaticDecorators from './utils/automaticdecorators';
         const ranges = selection.getFirstRange();
 
         let link = QMSCKEditorEnum.hyperLink;
-        link.typeId = 0;
-        link.targetId = 0;
-        link.protocolId = 0;
-        link.url = '';
-        link.title = '';
-        link.editorContent = '';
-        link.ckeditorId = editor.id;
-        for (const item of ranges.getItems()) {
-            if (item.data) {
-                link.title = item.data;
-            }
-        }
+
+		let parentLink = this._getSelectedLinkElement();
+
+		if(parentLink) {				
+			let linkOption = parentLink.getAttribute('url') || parentLink.getAttribute('option');
+			link.typeId = QMSCKEditorUtil.getLinkType(linkOption);
+			link.targetId = parentLink.getAttribute('target') ? QMSCKEditorEnum.targetEnum[parentLink.getAttribute('target')] : 0;
+			if (parentLink._children.length > 0) {
+				link.title = parentLink._children[0]._textData ? parentLink._children[0]._textData.trim() : '';
+			}
+			else {
+				link.title = '';
+			}
+			link.protocolId = QMSCKEditorUtil.getProtocolId(linkOption);
+			link.url = parentLink.getAttribute('href') || '';
+			link.edit = true;
+			link.ckeditorId = editor.id;
+		} else {
+			link.typeId = 0;
+			link.targetId = 0;
+			link.protocolId = 0;
+			link.url = '';
+			link.title = '';
+			link.editorContent = '';
+			link.ckeditorId = editor.id;
+			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) {
@@ -88,4 +109,35 @@ import AutomaticDecorators from './utils/automaticdecorators';
 
 		return doc.selection.getAttribute( decoratorName );
 	}
+
+	_getSelectedLinkElement() {
+		const view = this.editor.editing.view;
+		const selection = view.document.selection;
+
+		if ( selection.isCollapsed ) {
+			return findLinkElementAncestor( selection.getFirstPosition() );
+		} else {
+			// The range for fully selected link is usually anchored in adjacent text nodes.
+			// Trim it to get closer to the actual link element.
+			const range = selection.getFirstRange().getTrimmed();
+			const startLink = findLinkElementAncestor( range.start );
+			const endLink = findLinkElementAncestor( range.end );
+
+			if ( !startLink || startLink != endLink ) {
+				return null;
+			}
+
+			// Check if the link element is fully selected.
+			if ( view.createRangeIn( startLink ).getTrimmed().isEqual( range ) ) {
+				return startLink;
+			} else {
+				return null;
+			}
+		}
+	}
+
  }
+
+ function findLinkElementAncestor( position ) {
+	return position.getAncestors().find( ancestor => isLinkElement( ancestor ) );
+}