@syncfusion/ej2-richtexteditor 26.1.35 → 26.1.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dist/ej2-richtexteditor.min.js +2 -2
  2. package/dist/ej2-richtexteditor.umd.min.js +2 -2
  3. package/dist/ej2-richtexteditor.umd.min.js.map +1 -1
  4. package/dist/es6/ej2-richtexteditor.es2015.js +80 -32
  5. package/dist/es6/ej2-richtexteditor.es2015.js.map +1 -1
  6. package/dist/es6/ej2-richtexteditor.es5.js +80 -32
  7. package/dist/es6/ej2-richtexteditor.es5.js.map +1 -1
  8. package/dist/global/ej2-richtexteditor.min.js +2 -2
  9. package/dist/global/ej2-richtexteditor.min.js.map +1 -1
  10. package/dist/global/index.d.ts +1 -1
  11. package/package.json +11 -11
  12. package/src/editor-manager/plugin/ms-word-clean-up.js +3 -2
  13. package/src/editor-manager/plugin/video.js +12 -1
  14. package/src/rich-text-editor/actions/base-quick-toolbar.js +1 -1
  15. package/src/rich-text-editor/actions/count.js +1 -1
  16. package/src/rich-text-editor/actions/enter-key.js +31 -5
  17. package/src/rich-text-editor/actions/html-editor.js +4 -0
  18. package/src/rich-text-editor/actions/toolbar.js +2 -1
  19. package/src/rich-text-editor/base/rich-text-editor.js +1 -10
  20. package/src/rich-text-editor/renderer/image-module.d.ts +4 -0
  21. package/src/rich-text-editor/renderer/image-module.js +16 -8
  22. package/src/rich-text-editor/renderer/table-module.js +1 -1
  23. package/src/rich-text-editor/renderer/toolbar-renderer.js +2 -3
  24. package/src/rich-text-editor/renderer/video-module.js +8 -0
  25. package/styles/fluent2.css +10 -10
  26. package/styles/material3-dark.css +6 -6
  27. package/styles/material3.css +6 -6
  28. package/styles/rich-text-editor/_fluent2-definition.scss +1 -1
  29. package/styles/rich-text-editor/_layout.scss +20 -10
  30. package/styles/rich-text-editor/_material3-definition.scss +2 -2
  31. package/styles/rich-text-editor/fluent2.css +10 -10
  32. package/styles/rich-text-editor/material3-dark.css +6 -6
  33. package/styles/rich-text-editor/material3.css +6 -6
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 26.1.35
3
+ * version : 26.1.40
4
4
  * Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
5
5
  * Use of this code is subject to the terms of our license.
6
6
  * A copy of the current license can be obtained at any time by e-mailing
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "_from": "@syncfusion/ej2-richtexteditor@*",
3
- "_id": "@syncfusion/ej2-richtexteditor@23.1.54",
3
+ "_id": "@syncfusion/ej2-richtexteditor@26.1.38",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-nRcPQ0OfOscw8zBLuMrz7CIfxcpRf3sbkCqffFybabE7NbwtxHo13omNlYpOwISOBnSLaj5gsHV/0zXnN8Sg3g==",
5
+ "_integrity": "sha512-7x3b7CZyM0LWJX6JHTv8pbtJiHCY3NgyX85gtXTIjSdzEMKYwFdd0/t32rdLWXxw+rFI21YLOxIXqluPFN7FIA==",
6
6
  "_location": "/@syncfusion/ej2-richtexteditor",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -25,8 +25,8 @@
25
25
  "/@syncfusion/ej2-react-richtexteditor",
26
26
  "/@syncfusion/ej2-vue-richtexteditor"
27
27
  ],
28
- "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-release/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-23.1.54.tgz",
29
- "_shasum": "db04bfc3080175248eaf85d189ce8ce7df183f7e",
28
+ "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-26.1.38.tgz",
29
+ "_shasum": "eea83cd8e45f03e16016a5fe21f82c2db91094d8",
30
30
  "_spec": "@syncfusion/ej2-richtexteditor@*",
31
31
  "_where": "/jenkins/workspace/elease-automation_release_26.1.1/packages/included",
32
32
  "author": {
@@ -37,12 +37,12 @@
37
37
  },
38
38
  "bundleDependencies": false,
39
39
  "dependencies": {
40
- "@syncfusion/ej2-base": "~26.1.35",
41
- "@syncfusion/ej2-buttons": "~26.1.35",
42
- "@syncfusion/ej2-filemanager": "~26.1.35",
43
- "@syncfusion/ej2-inputs": "~26.1.35",
44
- "@syncfusion/ej2-navigations": "~26.1.35",
45
- "@syncfusion/ej2-popups": "~26.1.35",
40
+ "@syncfusion/ej2-base": "~26.1.37",
41
+ "@syncfusion/ej2-buttons": "~26.1.40",
42
+ "@syncfusion/ej2-filemanager": "~26.1.40",
43
+ "@syncfusion/ej2-inputs": "~26.1.40",
44
+ "@syncfusion/ej2-navigations": "~26.1.40",
45
+ "@syncfusion/ej2-popups": "~26.1.38",
46
46
  "@syncfusion/ej2-splitbuttons": "~26.1.35"
47
47
  },
48
48
  "deprecated": false,
@@ -79,6 +79,6 @@
79
79
  "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
80
80
  },
81
81
  "typings": "index.d.ts",
82
- "version": "26.1.35",
82
+ "version": "26.1.40",
83
83
  "sideEffects": false
84
84
  }
@@ -487,12 +487,13 @@ var MsWordPaste = /** @class */ (function () {
487
487
  this.filterStyles(elm, wordPasteStyleConfig);
488
488
  var resultElem = void 0;
489
489
  var fromClass = false;
490
+ var regex = /^(p|div|li)\.(1|10|11)$/;
490
491
  for (var i = 0; i < keys.length; i++) {
491
492
  if (keys[i].split('.')[0] === '') {
492
493
  resultElem = elm.getElementsByClassName(keys[i].split('.')[1]);
493
494
  fromClass = true;
494
495
  }
495
- else if (keys[i].split('.').length === 1 && keys[i].split('.')[0].indexOf('@') >= 0) {
496
+ else if ((keys[i].split('.').length === 1 && keys[i].split('.')[0].indexOf('@') >= 0) || (regex.test(keys[i]))) {
496
497
  continue;
497
498
  }
498
499
  else if (keys[i].split('.').length === 1 && keys[i].split('.')[0].indexOf('@') < 0) {
@@ -668,7 +669,7 @@ var MsWordPaste = /** @class */ (function () {
668
669
  if (content && content.indexOf('mso-list:') !== -1) {
669
670
  var msoListValue = void 0;
670
671
  if (content.match(/mso-list:[^;]+;?/)) {
671
- var changedContent = content.replace('\n', '').split(' ').join('');
672
+ var changedContent = content.replace(new RegExp('\n', 'g'), '').split(' ').join('');
672
673
  msoListValue = changedContent.match(/mso-list:[^;]+;?/)[0].split(':l');
673
674
  listFormatOverride = isNOU(msoListValue) ? null : parseInt(msoListValue[1].split('level')[0], 10);
674
675
  }
@@ -1,4 +1,4 @@
1
- import { createElement, isNullOrUndefined as isNOU, detach, addClass, Browser, formatUnit } from '@syncfusion/ej2-base';
1
+ import { createElement, isNullOrUndefined as isNOU, detach, addClass, Browser, formatUnit, removeClass } from '@syncfusion/ej2-base';
2
2
  import * as CONSTANT from './../base/constant';
3
3
  import * as classes from './../base/classes';
4
4
  import { InsertHtml } from './inserthtml';
@@ -121,6 +121,7 @@ var VideoCommand = /** @class */ (function () {
121
121
  clickElement.appendChild(temp.content);
122
122
  this.vidElement = sourceElement = clickElement.firstElementChild;
123
123
  this.setStyle(sourceElement, e, this.vidElement);
124
+ wrapElement.style.display = (e.item.cssClass === classes.CLASS_VIDEO_INLINE) ? 'inline-block' : 'block';
124
125
  wrapElement.appendChild(clickElement);
125
126
  }
126
127
  else {
@@ -253,6 +254,16 @@ var VideoCommand = /** @class */ (function () {
253
254
  if (!isNOU(e.item.height) && !isNOU(e.item.height.maxHeight)) {
254
255
  videoEle.style.maxHeight = formatUnit(e.item.height.maxHeight);
255
256
  }
257
+ if (!isNOU(e.item.cssClass)) {
258
+ if (e.item.cssClass === classes.CLASS_VIDEO_BREAK) {
259
+ addClass([videoEle], [classes.CLASS_VIDEO_BREAK]);
260
+ removeClass([videoEle], [classes.CLASS_VIDEO_INLINE]);
261
+ }
262
+ else {
263
+ addClass([videoEle], [classes.CLASS_VIDEO_INLINE]);
264
+ removeClass([videoEle], [classes.CLASS_VIDEO_BREAK]);
265
+ }
266
+ }
256
267
  };
257
268
  VideoCommand.prototype.videoDimension = function (e) {
258
269
  var selectNode = !(e.item.selectNode[0].classList.contains(classes.CLASS_VIDEO_CLICK_ELEM)) ? e.item.selectNode[0] :
@@ -304,7 +304,7 @@ var BaseQuickToolbar = /** @class */ (function () {
304
304
  _this.checkCollision(showPopupData, 'document', ((_this.parent.inlineMode.enable) ? 'inline' : (type === 'text') ? 'text' : ''));
305
305
  _this.popupObj.element.classList.remove('e-popup-open');
306
306
  removeClass([_this.element], [classes.CLS_HIDE]);
307
- _this.popupObj.show({ name: 'ZoomIn', duration: (Browser.isIE ? 250 : 400) });
307
+ _this.popupObj.show({ name: 'ZoomIn', duration: (Browser.isIE ? 250 : 400) }, target);
308
308
  if (_this.popupObj && _this.parent.cssClass) {
309
309
  removeClass([_this.popupObj.element], _this.parent.cssClass.replace(/\s+/g, ' ').trim().split(' '));
310
310
  addClass([_this.popupObj.element], _this.parent.cssClass.replace(/\s+/g, ' ').trim().split(' '));
@@ -39,7 +39,7 @@ var Count = /** @class */ (function () {
39
39
  };
40
40
  Count.prototype.appendCount = function () {
41
41
  var htmlText = this.parent.editorMode === 'Markdown' ? this.editPanel.value :
42
- (this.parent.getText().replace(/(\r\n|\n|\r|\t)/gm, ''));
42
+ (isNullOrUndefined(this.parent.getText()) ? '' : (this.parent.getText().replace(/(\r\n|\n|\r|\t)/gm, '')));
43
43
  if (this.parent.editorMode !== 'Markdown' && htmlText.indexOf('\u200B') !== -1) {
44
44
  this.htmlLength = htmlText.replace(/\u200B/g, '').length;
45
45
  }
@@ -408,8 +408,17 @@ var EnterKeyAction = /** @class */ (function () {
408
408
  }
409
409
  else {
410
410
  var lineBreakBRElem = _this.parent.createElement('br');
411
- _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, _this.range.startContainer);
412
- _this.parent.formatter.editorManager.domNode.insertAfter(lineBreakBRElem, _this.range.startContainer);
411
+ var anchorElement = (!isNOU(_this.range.startContainer.parentElement) && _this.range.startContainer.parentElement.nodeName === 'A'
412
+ && _this.range.startContainer.parentElement.textContent.length === _this.range.startOffset)
413
+ ? _this.range.startContainer.parentElement : _this.range.startContainer;
414
+ _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, anchorElement);
415
+ _this.parent.formatter.editorManager.domNode.insertAfter(lineBreakBRElem, anchorElement);
416
+ var brSibling = anchorElement.nextElementSibling;
417
+ var brNextSibling = !isNOU(brSibling) ? brSibling.nextElementSibling : null;
418
+ if (!isNOU(brSibling) && !isNOU(brNextSibling) && !isNOU(brNextSibling.nextElementSibling) &&
419
+ brSibling.nodeName === 'BR' && brNextSibling.nodeName === 'BR' && brNextSibling.nextElementSibling.nodeName === 'BR') {
420
+ brNextSibling.nextElementSibling.remove();
421
+ }
413
422
  }
414
423
  }
415
424
  _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), focusBRElem, 0);
@@ -478,6 +487,13 @@ var EnterKeyAction = /** @class */ (function () {
478
487
  isFocusTextNode = false;
479
488
  }
480
489
  var brElm = this.parent.createElement('br');
490
+ var findAnchorLastChild = this.startNode;
491
+ while (findAnchorLastChild.lastChild) {
492
+ findAnchorLastChild = findAnchorLastChild.lastChild;
493
+ }
494
+ var findAnchorElement = this.startNode.nodeName === 'A' && this.endNode.nodeName === 'A' &&
495
+ !isNOU(this.range.startContainer.parentElement) && this.range.startOffset === this.range.endOffset &&
496
+ this.range.startContainer.textContent.trim().length === findAnchorLastChild.textContent.trim().length;
481
497
  if (this.startNode.nodeName === 'BR' && this.endNode.nodeName === 'BR' && this.range.startOffset === 0 && this.range.startOffset === this.range.endOffset) {
482
498
  this.parent.formatter.editorManager.domNode.insertAfter(brElm, this.startNode);
483
499
  isEmptyBrInserted = true;
@@ -487,15 +503,25 @@ var EnterKeyAction = /** @class */ (function () {
487
503
  this.range.startContainer.previousSibling.nodeName === 'BR' && this.range.startContainer.textContent.length === 0) {
488
504
  isEmptyBrInserted = true;
489
505
  }
490
- this.range.insertNode(brElm);
506
+ if (findAnchorElement) {
507
+ this.parent.formatter.editorManager.domNode.insertAfter(brElm, this.startNode);
508
+ }
509
+ else {
510
+ this.range.insertNode(brElm);
511
+ }
491
512
  }
492
513
  if (isEmptyBrInserted || (!isNOU(brElm.nextElementSibling) && brElm.nextElementSibling.tagName === 'BR') || (!isNOU(brElm.nextSibling) && brElm.nextSibling.textContent.length > 0)) {
493
514
  this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), !isNOU(brElm.nextSibling) && isFocusTextNode ? brElm.nextSibling : brElm, 0);
494
515
  isEmptyBrInserted = false;
495
516
  }
496
517
  else {
497
- var brElm2 = this.parent.createElement('br');
498
- this.range.insertNode(brElm2);
518
+ var brElements = this.parent.createElement('br');
519
+ if (findAnchorElement) {
520
+ this.parent.formatter.editorManager.domNode.insertAfter(brElements, this.startNode);
521
+ }
522
+ else {
523
+ this.range.insertNode(brElements);
524
+ }
499
525
  this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), brElm, 0);
500
526
  }
501
527
  };
@@ -702,6 +702,10 @@ var HtmlEditor = /** @class */ (function () {
702
702
  }
703
703
  paraElem[i].innerHTML = resultSplitContent.trim();
704
704
  }
705
+ var anchorElement = divElement.childNodes[0];
706
+ if (!isNullOrUndefined(anchorElement) && !isNullOrUndefined(anchorElement.childNodes[0]) && anchorElement.nodeName === 'SPAN' && anchorElement.childNodes[0].nodeName === 'A') {
707
+ divElement.innerHTML = divElement.innerHTML.replace('<span>', '').replace('</span>', '');
708
+ }
705
709
  if (!isNullOrUndefined(this.parent.pasteCleanupModule)) {
706
710
  e.callBack(divElement.innerHTML);
707
711
  }
@@ -250,9 +250,10 @@ var Toolbar = /** @class */ (function () {
250
250
  */
251
251
  Toolbar.prototype.updateItem = function (args) {
252
252
  var item = this.tools[args.updateItem.toLocaleLowerCase()];
253
- if (this.parent.locale !== 'en-US') {
253
+ if ((getTooltipText(args.updateItem.toLocaleLowerCase(), this.locator) !== 'Code View' && getTooltipText(args.updateItem.toLocaleLowerCase(), this.locator) !== 'Preview') || this.parent.locale !== 'en-US') {
254
254
  item.tooltip = getTooltipText(args.updateItem.toLocaleLowerCase(), this.locator);
255
255
  }
256
+ ;
256
257
  var trgItem = this.tools[args.targetItem.toLocaleLowerCase()];
257
258
  var index = getTBarItemsIndex(getCollection(trgItem.subCommand), args.baseToolbar.toolbarObj.items)[0];
258
259
  if (!isNOU(index)) {
@@ -1078,15 +1078,6 @@ var RichTextEditor = /** @class */ (function (_super) {
1078
1078
  detach(tooltipEle);
1079
1079
  }
1080
1080
  }
1081
- if (this.element.offsetParent === null) {
1082
- if (!isNOU(this.toolbarModule)) {
1083
- this.toolbarModule.destroy();
1084
- }
1085
- this.notify(events.moduleDestroy, {});
1086
- _super.prototype.destroy.call(this);
1087
- this.isRendered = false;
1088
- return;
1089
- }
1090
1081
  this.notify(events.destroy, {});
1091
1082
  this.destroyDependentModules();
1092
1083
  this.unWireEvents();
@@ -2178,7 +2169,7 @@ var RichTextEditor = /** @class */ (function (_super) {
2178
2169
  }
2179
2170
  }
2180
2171
  this.removeSelectionClassStates(valueElementWrapper);
2181
- return valueElementWrapper.innerHTML;
2172
+ return (this.editorMode === 'Markdown') ? valueElementWrapper.innerHTML.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&') : valueElementWrapper.innerHTML;
2182
2173
  };
2183
2174
  RichTextEditor.prototype.updateStatus = function (e) {
2184
2175
  if (!isNOU(e.html) || !isNOU(e.markdown)) {
@@ -39,6 +39,10 @@ export declare class Image {
39
39
  private removingImgName;
40
40
  private currentResizeHandler;
41
41
  private aspectRatio;
42
+ private drop;
43
+ private drag;
44
+ private enter;
45
+ private start;
42
46
  private constructor();
43
47
  protected addEventListener(): void;
44
48
  protected removeEventListener(): void;
@@ -25,6 +25,10 @@ var Image = /** @class */ (function () {
25
25
  this.rendererFactory = serviceLocator.getService('rendererFactory');
26
26
  this.dialogRenderObj = serviceLocator.getService('dialogRenderObject');
27
27
  this.addEventListener();
28
+ this.drop = this.dragDrop.bind(this);
29
+ this.drag = this.dragOver.bind(this);
30
+ this.enter = this.dragEnter.bind(this);
31
+ this.start = this.dragStart.bind(this);
28
32
  }
29
33
  Image.prototype.addEventListener = function () {
30
34
  if (this.parent.isDestroyed) {
@@ -83,10 +87,14 @@ var Image = /** @class */ (function () {
83
87
  this.parent.off(events.moduleDestroy, this.moduleDestroy);
84
88
  var dropElement = this.parent.iframeSettings.enable ? this.parent.inputElement.ownerDocument
85
89
  : this.parent.inputElement;
86
- dropElement.removeEventListener('drop', this.dragDrop.bind(this), true);
87
- dropElement.removeEventListener('dragstart', this.dragStart.bind(this), true);
88
- dropElement.removeEventListener('dragenter', this.dragEnter.bind(this), true);
89
- dropElement.removeEventListener('dragover', this.dragOver.bind(this), true);
90
+ dropElement.removeEventListener('drop', this.drop, true);
91
+ dropElement.removeEventListener('dragstart', this.drag, true);
92
+ dropElement.removeEventListener('dragenter', this.enter, true);
93
+ dropElement.removeEventListener('dragover', this.start, true);
94
+ this.drop = null;
95
+ this.drag = null;
96
+ this.enter = null;
97
+ this.start = null;
90
98
  if (!isNOU(this.contentModule)) {
91
99
  EventHandler.remove(this.contentModule.getEditPanel(), Browser.touchEndEvent, this.imageClick);
92
100
  this.parent.formatter.editorManager.observer.off(events.checkUndo, this.undoStack);
@@ -140,10 +148,10 @@ var Image = /** @class */ (function () {
140
148
  }
141
149
  var dropElement = this.parent.iframeSettings.enable ? this.parent.inputElement.ownerDocument :
142
150
  this.parent.inputElement;
143
- dropElement.addEventListener('drop', this.dragDrop.bind(this), true);
144
- dropElement.addEventListener('dragstart', this.dragStart.bind(this), true);
145
- dropElement.addEventListener('dragenter', this.dragOver.bind(this), true);
146
- dropElement.addEventListener('dragover', this.dragOver.bind(this), true);
151
+ dropElement.addEventListener('drop', this.drop, true);
152
+ dropElement.addEventListener('dragstart', this.drag, true);
153
+ dropElement.addEventListener('dragenter', this.enter, true);
154
+ dropElement.addEventListener('dragover', this.start, true);
147
155
  };
148
156
  Image.prototype.undoStack = function (args) {
149
157
  if (args.subCommand.toLowerCase() === 'undo' || args.subCommand.toLowerCase() === 'redo') {
@@ -2019,7 +2019,7 @@ var Table = /** @class */ (function () {
2019
2019
  var argument = ((Browser.isDevice || (!isNullOrUndefined(args.args)
2020
2020
  && !isNullOrUndefined(args.args.originalEvent) &&
2021
2021
  args.args.originalEvent.action === 'insert-table')
2022
- || proxy.parent.inlineMode.enable || !isNullOrUndefined(proxy.parent.quickToolbarSettings.text)) ? args :
2022
+ || proxy.parent.inlineMode.enable || ((!isNullOrUndefined(proxy.parent.quickToolbarSettings.text)) && !(args instanceof PointerEvent))) ? args :
2023
2023
  this);
2024
2024
  proxy.tableInsert(proxy.rowTextBox.value, proxy.columnTextBox.value, e, argument);
2025
2025
  }
@@ -617,9 +617,8 @@ var ToolbarRenderer = /** @class */ (function () {
617
617
  cssClass: ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass + ' ' + 'e-rte-picker-init',
618
618
  created: function () {
619
619
  var value = (item === 'backgroundcolor') ? proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
620
- colorPicker.setProperties({ value: value });
621
- colorPicker.cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
622
- colorPicker.value = value;
620
+ var cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
621
+ colorPicker.setProperties({ value: value, cssClass: cssClass });
623
622
  },
624
623
  mode: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.mode : proxy.parent.fontColor.mode),
625
624
  modeSwitcher: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.modeSwitcher : proxy.parent.fontColor.modeSwitcher),
@@ -1399,6 +1399,14 @@ var Video = /** @class */ (function () {
1399
1399
  if (!isNullOrUndefined(proxy.uploadUrl) && proxy.uploadUrl.url !== '') {
1400
1400
  proxy.uploadUrl.cssClass = (proxy.parent.insertVideoSettings.layoutOption === 'Inline' ?
1401
1401
  classes.CLS_VIDEOINLINE : classes.CLS_VIDEOBREAK);
1402
+ proxy.uploadUrl.width = {
1403
+ width: proxy.parent.insertVideoSettings.width, minWidth: proxy.parent.insertVideoSettings.minWidth,
1404
+ maxWidth: proxy.parent.getInsertImgMaxWidth()
1405
+ };
1406
+ proxy.uploadUrl.height = {
1407
+ height: proxy.parent.insertVideoSettings.height, minHeight: proxy.parent.insertVideoSettings.minHeight,
1408
+ maxHeight: proxy.parent.insertVideoSettings.maxHeight
1409
+ };
1402
1410
  proxy.dialogObj.hide({ returnValue: false });
1403
1411
  proxy.parent.formatter.process(proxy.parent, this.args, this.args.originalEvent, proxy.uploadUrl);
1404
1412
  proxy.uploadUrl.url = '';
@@ -207,7 +207,7 @@
207
207
  --color-sf-info-outline: var(--color-sf-info-border-color);
208
208
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
209
209
  --color-sf-tooltip-border: var(--color-sf-content-bg-color-alt1);
210
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
210
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
211
211
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
212
212
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
213
213
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -478,7 +478,7 @@
478
478
  --color-sf-success-bg-color: #218c21;
479
479
  --color-sf-success-border-color: var(--color-sf-success-bg-color);
480
480
  --color-sf-success-text: var(--color-sf-primary-text-color);
481
- --color-sf-success-bg-color-hover: var(--color-sf-success-bg-color);
481
+ --color-sf-success-bg-color-hover: #0e700e;
482
482
  --color-sf-success-border-color-hover: var(--color-sf-success-bg-color-hover);
483
483
  --color-sf-success-text-hover: var(--color-sf-primary-text-color);
484
484
  --color-sf-success-bg-color-pressed: #052505;
@@ -496,7 +496,7 @@
496
496
  --color-sf-warning-bg-color: #f87528;
497
497
  --color-sf-warning-border-color: var(--color-sf-warning-bg-color);
498
498
  --color-sf-warning-text: #242424;
499
- --color-sf-warning-bg-color-hover: var(--color-sf-warning-bg-color);
499
+ --color-sf-warning-bg-color-hover: #de590b;
500
500
  --color-sf-warning-border-color-hover: var(--color-sf-warning-bg-color-hover);
501
501
  --color-sf-warning-text-hover: var(--color-sf-primary-text-color);
502
502
  --color-sf-warning-bg-color-pressed: #4a1e04;
@@ -555,7 +555,7 @@
555
555
  --color-sf-info-outline: #0099bc;
556
556
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
557
557
  --color-sf-tooltip-border: var(--color-sf-tooltip-bg-color);
558
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
558
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
559
559
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
560
560
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
561
561
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -897,7 +897,7 @@
897
897
  --color-sf-info-outline: #0099bc;
898
898
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
899
899
  --color-sf-tooltip-border: var(--color-sf-border-light);
900
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
900
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
901
901
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
902
902
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color);
903
903
  --color-sf-appbar-bg-color-alt1: #fff;
@@ -2780,13 +2780,13 @@
2780
2780
  font-size: 2em;
2781
2781
  font-weight: bold;
2782
2782
  height: 40px;
2783
- line-height: 40px;
2783
+ line-height: 25px;
2784
2784
  }
2785
2785
  .e-rte-dropdown-popup ul .e-item.e-h2 {
2786
2786
  font-size: 1.5em;
2787
2787
  font-weight: bold;
2788
2788
  height: 40px;
2789
- line-height: 40px;
2789
+ line-height: 25px;
2790
2790
  }
2791
2791
  .e-rte-dropdown-popup ul .e-item.e-h3 {
2792
2792
  font-size: 1.16em;
@@ -3160,13 +3160,13 @@
3160
3160
  margin: 0 auto;
3161
3161
  padding: 6px 12px 6px 12px;
3162
3162
  position: relative;
3163
- top: -50px;
3163
+ top: -120px;
3164
3164
  }
3165
3165
  .e-richtexteditor .e-dialog .e-vid-uploadwrap.e-droparea .e-browsebtn,
3166
3166
  .e-richtexteditor .e-rte-video-dialog.e-dialog.e-device.e-dlg-modal .e-vid-uploadwrap.e-droparea .e-browsebtn,
3167
3167
  .e-rte-elements .e-dialog .e-vid-uploadwrap.e-droparea .e-browsebtn,
3168
3168
  .e-rte-elements .e-rte-video-dialog.e-dialog.e-device.e-dlg-modal .e-vid-uploadwrap.e-droparea .e-browsebtn {
3169
- top: -50px;
3169
+ top: -120px;
3170
3170
  }
3171
3171
  .e-richtexteditor .e-dialog.e-device.e-dlg-modal .e-img-uploadwrap.e-droparea .e-browsebtn,
3172
3172
  .e-richtexteditor .e-dialog.e-device.e-dlg-modal .e-aud-uploadwrap.e-droparea .e-browsebtn,
@@ -4068,7 +4068,7 @@
4068
4068
  margin: 0 auto;
4069
4069
  padding: 6px 12px 6px 12px;
4070
4070
  position: relative;
4071
- top: -50px;
4071
+ top: -120px;
4072
4072
  }
4073
4073
  .e-rte-elements.e-dialog .e-vid-uploadwrap.e-droparea .e-browsebtn,
4074
4074
  .e-rte-elements.e-dialog .e-rte-video-dialog.e-dialog.e-device.e-dlg-modal .e-vid-uploadwrap.e-droparea .e-browsebtn {
@@ -1318,7 +1318,7 @@
1318
1318
  .e-richtexteditor .e-rte-toolbar.e-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-background-color.e-icons::before,
1319
1319
  .e-richtexteditor .e-rte-toolbar.e-toolbar.e-extended-toolbar .e-toolbar-extended .e-toolbar-item .e-background-color.e-icons::before {
1320
1320
  display: inline;
1321
- font-size: 18px;
1321
+ font-size: 16px;
1322
1322
  }
1323
1323
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn .e-order-list.e-icons,
1324
1324
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn .e-unorder-list.e-icons,
@@ -1672,7 +1672,7 @@
1672
1672
  }
1673
1673
  .e-richtexteditor .e-toolbar .e-toolbar-item .e-tbar-btn,
1674
1674
  .e-richtexteditor .e-toolbar.e-extended-toolbar .e-toolbar-extended.e-toolbar-pop .e-toolbar-item .e-tbar-btn {
1675
- font-size: 14px;
1675
+ font-size: 16px;
1676
1676
  }
1677
1677
  .e-richtexteditor .e-clickelem::after,
1678
1678
  .e-richtexteditor .e-video-clickelem::after {
@@ -3164,7 +3164,7 @@
3164
3164
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
3165
3165
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3166
3166
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3167
- font-size: 14px;
3167
+ font-size: 16px;
3168
3168
  }
3169
3169
 
3170
3170
  .e-bigger .e-rte-text-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
@@ -3173,17 +3173,17 @@
3173
3173
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
3174
3174
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3175
3175
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3176
- font-size: 16px;
3176
+ font-size: 18px;
3177
3177
  }
3178
3178
 
3179
3179
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3180
3180
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3181
- font-size: 14px;
3181
+ font-size: 16px;
3182
3182
  }
3183
3183
 
3184
3184
  .e-bigger .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3185
3185
  .e-bigger .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3186
- font-size: 16px;
3186
+ font-size: 18px;
3187
3187
  }
3188
3188
  .e-bigger .e-rte-container {
3189
3189
  border-radius: 4px;
@@ -1374,7 +1374,7 @@
1374
1374
  .e-richtexteditor .e-rte-toolbar.e-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-background-color.e-icons::before,
1375
1375
  .e-richtexteditor .e-rte-toolbar.e-toolbar.e-extended-toolbar .e-toolbar-extended .e-toolbar-item .e-background-color.e-icons::before {
1376
1376
  display: inline;
1377
- font-size: 18px;
1377
+ font-size: 16px;
1378
1378
  }
1379
1379
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn .e-order-list.e-icons,
1380
1380
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn .e-unorder-list.e-icons,
@@ -1728,7 +1728,7 @@
1728
1728
  }
1729
1729
  .e-richtexteditor .e-toolbar .e-toolbar-item .e-tbar-btn,
1730
1730
  .e-richtexteditor .e-toolbar.e-extended-toolbar .e-toolbar-extended.e-toolbar-pop .e-toolbar-item .e-tbar-btn {
1731
- font-size: 14px;
1731
+ font-size: 16px;
1732
1732
  }
1733
1733
  .e-richtexteditor .e-clickelem::after,
1734
1734
  .e-richtexteditor .e-video-clickelem::after {
@@ -3220,7 +3220,7 @@
3220
3220
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
3221
3221
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3222
3222
  .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3223
- font-size: 14px;
3223
+ font-size: 16px;
3224
3224
  }
3225
3225
 
3226
3226
  .e-bigger .e-rte-text-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
@@ -3229,17 +3229,17 @@
3229
3229
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-dropdown-btn-text,
3230
3230
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3231
3231
  .e-bigger .e-rte-inline-popup .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3232
- font-size: 16px;
3232
+ font-size: 18px;
3233
3233
  }
3234
3234
 
3235
3235
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3236
3236
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3237
- font-size: 14px;
3237
+ font-size: 16px;
3238
3238
  }
3239
3239
 
3240
3240
  .e-bigger .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-background-color,
3241
3241
  .e-bigger .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn .e-rte-font-color {
3242
- font-size: 16px;
3242
+ font-size: 18px;
3243
3243
  }
3244
3244
  .e-bigger .e-rte-container {
3245
3245
  border-radius: 4px;
@@ -92,7 +92,7 @@ $rte-default-character-count-opacity: 1;
92
92
  $rte-droparea-line-height: 10;
93
93
  $rte-droparea-browsebtn-height: 32px;
94
94
  $rte-droparea-browsebtn-padding: 6px 12px 6px 12px;
95
- $rte-droparea-browsebtn-top: -50px;
95
+ $rte-droparea-browsebtn-top: -120px;
96
96
  $rte-big-droparea-browsebtn-top: -120px;
97
97
  $rte-insert-dialog-font-size: 14px;
98
98
  $rte-big-insert-dialog-font-size: 15px;
@@ -1190,14 +1190,24 @@
1190
1190
  font-size: 2em;
1191
1191
  font-weight: bold;
1192
1192
  height: 40px;
1193
- line-height: 40px;
1193
+ @if $skin-name =='fluent2' {
1194
+ line-height: 25px;
1195
+ }
1196
+ @else {
1197
+ line-height: 40px;
1198
+ }
1194
1199
  }
1195
1200
 
1196
1201
  &.e-h2 {
1197
1202
  font-size: 1.5em;
1198
1203
  font-weight: bold;
1199
1204
  height: 40px;
1200
- line-height: 40px;
1205
+ @if $skin-name =='fluent2' {
1206
+ line-height: 25px;
1207
+ }
1208
+ @else {
1209
+ line-height: 40px;
1210
+ }
1201
1211
  }
1202
1212
 
1203
1213
  &.e-h3 {
@@ -2539,7 +2549,7 @@
2539
2549
  .e-rte-dropdown-btn-text,
2540
2550
  .e-background-color,
2541
2551
  .e-rte-font-color {
2542
- font-size: 14px;
2552
+ font-size: 16px;
2543
2553
  }
2544
2554
  }
2545
2555
  .e-bigger {
@@ -2548,27 +2558,27 @@
2548
2558
  .e-rte-dropdown-btn-text,
2549
2559
  .e-background-color,
2550
2560
  .e-rte-font-color {
2551
- font-size: 16px;
2561
+ font-size: 18px;
2552
2562
  }
2553
2563
  }
2554
2564
  }
2555
2565
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn {
2556
2566
  .e-background-color,
2557
- .e-rte-font-color{
2558
- font-size: 14px;
2567
+ .e-rte-font-color {
2568
+ font-size: 16px;
2559
2569
  }
2560
2570
  }
2561
2571
  .e-bigger {
2562
2572
  .e-richtexteditor .e-rte-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn {
2563
2573
  .e-background-color,
2564
- .e-rte-font-color{
2565
- font-size: 16px;
2574
+ .e-rte-font-color {
2575
+ font-size: 18px;
2566
2576
  }
2567
2577
  }
2568
- .e-rte-container{
2578
+ .e-rte-container {
2569
2579
  border-radius: 4px;
2570
2580
  }
2571
- .e-richtexteditor{
2581
+ .e-richtexteditor {
2572
2582
  border-radius: 4px;
2573
2583
  .e-toolbar {
2574
2584
  border-radius: 4px 4px 0 0;
@@ -242,8 +242,8 @@ $rte-tbar-default-bg: $content-bg-color-alt2 !default;
242
242
  $rte-extended-toolbar-items-padding: 0;
243
243
  $rte-expand-tbar-hover-bg: $content-bg-color-hover !default;
244
244
  $rte-big-insert-dialog-label-padding-top: 12px;
245
- $rte-tbar-icon-size: 14px;
246
- $rte-background-color-icon-fontsize: 18px;
245
+ $rte-tbar-icon-size: 16px;
246
+ $rte-background-color-icon-fontsize: 16px;
247
247
  $rte-big-background-color-icon-fontsize: 20px;
248
248
  $rte-dropdown-btn-color-content-padding: 0 !default;
249
249
  $rte-big-dropdown-btn-color-content-padding: 9.5px !default;