qms-angular 1.1.26 → 1.1.28

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

@@ -101,7 +101,7 @@ export default class LinkFormView extends View {
 		 * @readonly
 		 * @type {module:ui/viewcollection~ViewCollection}
 		 */
-		this.children = this._createFormChildren( linkCommand.manualDecorators );
+		 this.children = this._createFormChildren( linkCommand.manualDecorators );
 
 		/**
 		 * A collection of views that can be focused in the form.
@@ -304,29 +304,29 @@ export default class LinkFormView extends View {
 		children.add( this.urlInputView );
 
 		if ( manualDecorators.length ) {
-			const additionalButtonsView = new View();
-
-			additionalButtonsView.setTemplate( {
-				tag: 'ul',
-				children: this._manualDecoratorSwitches.map( switchButton => ( {
-					tag: 'li',
-					children: [ switchButton ],
-					attributes: {
-						class: [
-							'ck',
-							'ck-list__item'
-						]
-					}
-				} ) ),
-				attributes: {
-					class: [
-						'ck',
-						'ck-reset',
-						'ck-list'
-					]
-				}
-			} );
-			children.add( additionalButtonsView );
+			// const additionalButtonsView = new View();
+
+			// additionalButtonsView.setTemplate( {
+			// 	tag: 'ul',
+			// 	children: this._manualDecoratorSwitches.map( switchButton => ( {
+			// 		tag: 'li',
+			// 		children: [ switchButton ],
+			// 		attributes: {
+			// 			class: [
+			// 				'ck',
+			// 				'ck-list__item'
+			// 			]
+			// 		}
+			// 	} ) ),
+			// 	attributes: {
+			// 		class: [
+			// 			'ck',
+			// 			'ck-reset',
+			// 			'ck-list'
+			// 		]
+			// 	}
+			// } );
+			// children.add( additionalButtonsView );
 		}
 
 		children.add( this.saveButtonView );

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

@@ -10,7 +10,7 @@
 import { upperFirst } from 'lodash-es';
 
 const ATTRIBUTE_WHITESPACES = /[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205f\u3000]/g; // eslint-disable-line no-control-regex
-const SAFE_URL = /^(?:(?:https?|ftps?|mailto):|[^a-z]|[a-z+.-]+(?:[^a-z+.:-]|$))/i;
+const SAFE_URL = /^(?:(?:https?|ftps?|mailto?|news?):|[^a-z]|[a-z+.-]+(?:[^a-z+.:-]|$))/i;
 
 // Simplified email test - should be run over previously found URL.
 const EMAIL_REG_EXP = /^[\S]+@((?![-_])(?:[-\w\u00a1-\uffff]{0,63}[^-_]\.))+(?:[a-z\u00a1-\uffff]{2,})$/i;
@@ -49,6 +49,13 @@ export function createLinkElement( href, { writer } ) {
 	return linkElement;
 }
 
+export function createLinkOptionElement(option, { writer }) {
+	const linkElement = writer.createAttributeElement( 'a', { option }, { priority: 5 } );
+	writer.setCustomProperty( 'link', true, linkElement );
+
+	return linkElement;
+}
+
 /**
  * Returns a safe URL based on a given value.
  *

package/src/assets/qms-ckeditor-plugin/src/plugins/table/converters/downcast.js

@@ -39,8 +39,8 @@ export function downcastInsertTable( options = {} ) {
 		const tableBorder = table.getAttribute( 'border-top' ) || table.getAttribute( 'border-bottom' ) || table.getAttribute( 'border-left' ) || table.getAttribute( 'border-right' ) || '';
 		const borderAttr = tableBorder === '' ? 'border: 1px solid rgb(0, 0, 0)' : null;
 		
-		const figureElement = conversionApi.writer.createContainerElement( 'figure', { class: 'table', style: `width: ${tableWidth}; height: ${tableHeight}` } );
-		const tableElement = conversionApi.writer.createContainerElement( 'table', { style: `width: 100%; height: ${tableHeight}; ${borderAttr}` } );
+		const figureElement = conversionApi.writer.createContainerElement( 'figure', { class: 'table', style: `height: ${tableHeight}` } );
+		const tableElement = conversionApi.writer.createContainerElement( 'table', { style: `width: ${tableWidth}; height: ${tableHeight}; ${borderAttr}` } );
 
 		conversionApi.writer.insert( conversionApi.writer.createPositionAt( figureElement, 0 ), tableElement );
 

package/src/assets/qms-ckeditor-plugin/src/plugins/template/loadtemplatedialogcommand.js

@@ -11,7 +11,26 @@ export default class LoadTemplateDialogCommand extends Command {
     const editor = this.editor;
     QMSCKEditorService.loadTemplateNotify(null);
     window.addEventListener(QMSCKEditorConstant.QMSCK_LOAD_TEMPLATE_PLUGIN_RESP, function (evt) {
-        editor.setData(evt.detail);
+        if(evt.detail && evt.detail.isReplace)
+        {
+            editor.setData(evt.detail.content);
+        }
+        else
+        {
+            if(evt.detail && evt.detail.content && evt.detail.content !== '')
+            {
+                let content = evt.detail.content;
+                if(!editor.model.document.selection.focus.isAtStart) // cursor in start of the text row
+                {
+                    content = '<p>&nbsp;</p>'+ evt.detail.content;
+                }
+                content += '<p>&nbsp;</p>';              
+                const viewFragment = editor.data.processor.toView( content );
+    
+                const modelFragment = editor.data.toModel( viewFragment );
+                editor.model.insertContent( modelFragment );
+            }
+        }
     }, { once: true });
 	}
 }

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

@@ -7,8 +7,8 @@
     & video {
         display: block;
         margin: 0 auto;
-        max-width: 100%;
         min-width: 50px;
+        width: 100%;
     }
 }
 

package/src/assets/qms-ckeditor-plugin/src/plugins/video/video/videoediting.js

@@ -28,7 +28,7 @@ export default class VideoEditing extends Plugin {
 			isObject: true,
 			isBlock: true,
 			allowWhere: '$block',
-			allowAttributes: [ 'src', 'controls' ]
+			allowAttributes: [ 'src', 'controls', 'poster' ]
 		} );
 
 		conversion.for( 'dataDowncast' ).elementToElement( {
@@ -41,8 +41,9 @@ export default class VideoEditing extends Plugin {
 			view: ( modelElement, { writer } ) => toVideoWidget( createVideoViewElement( writer ), writer, t( 'video widget' ) )
 		} );
 
-    conversion.for( 'downcast' ).add( modelToViewAttributeConverter( 'controls' ) );
+    	conversion.for( 'downcast' ).add( modelToViewAttributeConverter( 'controls' ) );
 		conversion.for( 'downcast' ).add( modelToViewAttributeConverter( 'src' ) );
+		conversion.for( 'downcast' ).add( modelToViewAttributeConverter( 'poster' ) );
 
 		conversion.for( 'upcast' )
 			.elementToElement( {

package/src/assets/qms-ckeditor-plugin/src/plugins/video/videoupload/uploadvideocommand.js

@@ -15,7 +15,7 @@ export default class UploadVideoCommand extends Command {
         const model = editor.model;
 
         for ( const url of toArray( options.urls ) ) {
-          insertVideo(model, { src: url , controls: true } );
+          insertVideo(model, { src: url , controls: true , poster: options.thumbnailUrl} );
       }
     }
 }

package/src/lib/components/related/popup/related-popup.component.scss

@@ -44,12 +44,20 @@
     margin-top: 12px;
   }
 
+  .panel__content_height_with_upload {
+    height: 380px;
+  }
+
   .panel__content_item {
     height: 350px;
     overflow: auto;
     margin-top: 12px;
   }
 
+  .panel__content_item_height_with_upload {
+    height: 257px;
+  }
+
   .panel-tree {
     .mat-expansion-panel-body {
       padding: 0 12px 12px;
@@ -303,6 +311,17 @@ cdk-virtual-scroll-viewport {
   padding: 0;
   font-weight: 600;
   font-family: "Raleway";
+
+  .selected-image {
+    display: flex;
+    align-items: center;
+    padding-bottom: 10px;
+
+    .input-upload {
+      height: 60px;
+      padding-left: 30px;
+    }
+  }
 }
 
 .padding-5 {

package/src/lib/components/select-department/select-department.component.scss

@@ -137,24 +137,17 @@
 
 
     span.related__item__content_name {
+      display: inline-block;
       min-width: calc(100% - 13px);
-      max-width: 250px;
-      display: flex;
-      align-items: center;
-      & > span:nth-child(1){
-        display: inline-block;
-        margin-right: 4px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        max-width: 200px;
-      }
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 220px;
 
       .select__include-children__count {
         font-size: 0.75rem;
         color: black(0.5);
         font-weight: 600;
-        line-height: 16px;
       }
     }
   }
@@ -208,16 +201,3 @@
       color: unset !important;
   }
 }
-
-@media screen and (max-width: 600px) {
-  ::ng-deep .cdk-global-overlay-wrapper{
-    justify-content: center !important;
-    width: 100vw;
-  }
-  .header-title{
-    font-size: 14px;
-  }
-  .related__item__content_name{
-  font-size: 12px !important;
-  }
-}