Skip to content

936667: Addressed the conflict issues #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

936667: Addressed the conflict issues #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
647215a
936667: Addressed the conflict issues
Kokila13081999 Jan 30, 2025
7fc017c
936667: Addressed the conflict issues
Kokila13081999 Jan 30, 2025
f496c07
936667: Addressed the conflict issues
Kokila13081999 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 2 additions & 7 deletions ej2-angular/code-snippet/rich-text-editor/editor-value-cs1/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor'
import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor';
import { ToolbarService, LinkService, ImageService, HtmlEditorService, ToolbarSettingsModel, RichTextEditorComponent } from '@syncfusion/ej2-angular-richtexteditor';
import { RichTextEditorModule } from '@syncfusion/ej2-angular-richtexteditor'


import { RichTextEditorModule } from '@syncfusion/ej2-angular-richtexteditor';
import { enableRipple } from '@syncfusion/ej2-base';
enableRipple(true);

import { Component } from '@angular/core';
import { ToolbarService, LinkService, ImageService, HtmlEditorService } from '@syncfusion/ej2-angular-richtexteditor';

@Component({
imports: [RichTextEditorAllModule],
standalone: true,
Expand Down
9 changes: 2 additions & 7 deletions ej2-angular/code-snippet/rich-text-editor/editor-value-cs2/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor'
import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor';
import { ToolbarService, LinkService, ImageService, HtmlEditorService, ToolbarSettingsModel, RichTextEditorComponent } from '@syncfusion/ej2-angular-richtexteditor';
import { RichTextEditorModule } from '@syncfusion/ej2-angular-richtexteditor'


import { RichTextEditorModule } from '@syncfusion/ej2-angular-richtexteditor';
import { enableRipple } from '@syncfusion/ej2-base';
enableRipple(true);

import { Component } from '@angular/core';
import { ToolbarService, LinkService, ImageService, HtmlEditorService } from '@syncfusion/ej2-angular-richtexteditor';

@Component({
imports: [RichTextEditorAllModule],
standalone: true,
Expand Down
15 changes: 7 additions & 8 deletions ej2-angular/code-snippet/rich-text-editor/getting-started-cs25/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ export class AppComponent {
public tools: object = {
items: [ 'FontName']
};
public size = {
default: '10',
width: '40px',
public family = {
default: 'Arial',
items: [
{ text: '8', value: '8pt' },
{ text: '10', value: '10pt' },
{ text: '12', value: '12pt' },
{ text: '14', value: '14pt' },
{ text: '42', value: '42pt' }
{ text: 'Arial', value: 'Arial, Helvetica, sans-serif' },
{ text: 'Courier New', value: '"Courier New", Courier, monospace' },
{ text: 'Georgia', value: 'Georgia, serif' },
{ text: 'Tahoma', value: 'Tahoma, Geneva, sans-serif' },
{ text: 'Verdana', value: 'Verdana, Geneva, sans-serif' }
]
};
}
9 changes: 6 additions & 3 deletions ej2-angular/code-snippet/rich-text-editor/getting-started-iframe-cs1/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { AppComponent } from './app.component';
// import the RichTextEditorModule for the Rich Text Editor component
import { RichTextEditorModule } from '@syncfusion/ej2-angular-richtexteditor';

Expand Down Expand Up @@ -31,7 +30,11 @@ import { ToolbarService, LinkService, ImageService, HtmlEditorService } from '@s
</ng-template>
</ejs-richtexteditor>`,
styleUrls: ['./app.component.css'],
providers: [ToolbarService, LinkService, ImageService, HtmlEditorService]
providers: [ToolbarService, LinkService, ImageService, HtmlEditorService],
imports: [RichTextEditorModule]
})
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})

export class AppComponent {
Expand Down
6 changes: 6 additions & 0 deletions ej2-angular/code-snippet/rich-text-editor/image-cs1/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@ export class AppComponent {
public tools: ToolbarSettingsModel = {
items: ['Image']
};
quickToolbarSettings: QuickToolbarSettingsModel = {
image: [
'Replace', 'Align', 'Caption', 'Remove', 'InsertLink', 'OpenImageLink', '-',
'EditImageLink', 'RemoveImageLink', 'Display', 'AltText', 'Dimension'
]
};
}
6 changes: 3 additions & 3 deletions ej2-angular/code-snippet/rich-text-editor/markdown-cs1/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { enableRipple } from '@syncfusion/ej2-base';
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorModule, ToolbarSettingsModel, NotifyArgs, RichTextEditorComponent, ContentRender, ToolbarService, LinkService, ImageService, MarkdownEditorService, TableService } from '@syncfusion/ej2-angular-richtexteditor';
import { createElement, isNullOrUndefined } from '@syncfusion/ej2-base';
import * as Marked from 'marked';
import { marked } from 'marked';
enableRipple(true);

@Component({
Expand Down Expand Up @@ -82,7 +82,7 @@ export class AppComponent {
if (this.mdSplit!.classList.contains('e-active')) {
let id: string = this.editorObj!.getID() + 'html-preview';
let htmlPreview: HTMLElement = this.editorObj!.element.querySelector('#' + id) as HTMLElement;
htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
public async fullPreview(e: { [key: string]: string | boolean }): Promise<void> {
Expand Down Expand Up @@ -110,7 +110,7 @@ export class AppComponent {
this.textArea!.style.width = '50%';
}
this.htmlPreview.style.display = 'block';
this.htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
this.htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ej2-angular/code-snippet/rich-text-editor/markdown-cs2/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorModule, ToolbarSettingsModel, RichTextEditorComponent, NotifyArgs, ContentRender, ToolbarService, LinkService, ImageService, MarkdownEditorService, TableService } from '@syncfusion/ej2-angular-richtexteditor';
import { createElement, isNullOrUndefined, enableRipple } from '@syncfusion/ej2-base';
import * as Marked from 'marked';
import { marked } from 'marked';

enableRipple(true);
@Component({
Expand Down Expand Up @@ -83,7 +83,7 @@ export class AppComponent {
if (this.mdSplit!.classList.contains('e-active')) {
let id: string = this.editorObj!.getID() + 'html-preview';
let htmlPreview: HTMLElement = this.editorObj!.element.querySelector('#' + id) as HTMLElement;
htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
public async fullPreview(e: { [key: string]: string | boolean }): Promise<void> {
Expand Down Expand Up @@ -111,7 +111,7 @@ export class AppComponent {
this.textArea!.style.width = '50%';
}
this.htmlPreview.style.display = 'block';
this.htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
this.htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ej2-angular/code-snippet/rich-text-editor/markdown-cs3/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorModule, ToolbarSettingsModel, NotifyArgs, RichTextEditorComponent, ContentRender, ToolbarService, LinkService, ImageService, MarkdownEditorService, TableService } from '@syncfusion/ej2-angular-richtexteditor';
import { createElement, isNullOrUndefined, enableRipple } from '@syncfusion/ej2-base';
import * as Marked from 'marked';
import { marked } from 'marked';

enableRipple(true);
@Component({
Expand Down Expand Up @@ -83,7 +83,7 @@ export class AppComponent {
if (this.mdSplit!.classList.contains('e-active')) {
let id: string = this.editorObj!.getID() + 'html-preview';
let htmlPreview: HTMLElement = this.editorObj!.element.querySelector('#' + id) as HTMLElement;
htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
public async fullPreview(e: { [key: string]: string | boolean }): Promise<void> {
Expand Down Expand Up @@ -111,7 +111,7 @@ export class AppComponent {
this.textArea!.style.width = '50%';
}
this.htmlPreview.style.display = 'block';
this.htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
this.htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
}
6 changes: 3 additions & 3 deletions ej2-angular/code-snippet/rich-text-editor/markdown-cs4/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { enableRipple, createElement } from '@syncfusion/ej2-base';
import { Component, ViewChild } from '@angular/core';
import { RichTextEditorModule, ToolbarSettingsModel, ContentRender, RichTextEditorComponent, MarkdownFormatter, ToolbarService, LinkService, ImageService, MarkdownEditorService, TableService } from '@syncfusion/ej2-angular-richtexteditor';
import * as Marked from 'marked';
import { marked } from 'marked';

enableRipple(true);
@Component({
Expand Down Expand Up @@ -51,7 +51,7 @@ export class AppComponent {
if (this.mdsource ?.classList.contains('e-active')) {
let id: string = this.editorObj ?.getID() + 'html-view';
let htmlPreview: Element = this.editorObj!.element.querySelector('#' + id) as Element;
htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
}
}
public async fullPreview(): Promise<void> {
Expand All @@ -70,7 +70,7 @@ export class AppComponent {
}
this.textArea!.style.display = 'none';
htmlPreview.style.display = 'block';
htmlPreview.innerHTML = await Marked.parse(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
htmlPreview.innerHTML = await marked(((this.editorObj!.contentModule as ContentRender).getEditPanel() as HTMLTextAreaElement).value);
this.mdsource!.parentElement!.title = 'Code View';
}
}
Expand Down
1 change: 1 addition & 0 deletions ej2-angular/code-snippet/rich-text-editor/markdown-cs5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@angular/compiler": "17.1.2",
"@angular/forms": "17.1.2",
"@angular/router": "17.1.2",
"marked": "^15.0.6",
"moment": "2.29.4",
"rxjs": "7.8.0",
"tslib": "2.3.0",
Expand Down
49 changes: 0 additions & 49 deletions ej2-angular/rich-text-editor/enter-key.md
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions ej2-angular/rich-text-editor/how-to/customize-shortcut-keys.md
View file
Open in desktop

This file was deleted.

Loading