Skip to content

Moved latest changes to source #164

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

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Moved latest changes to source #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controls/documenteditor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@syncfusion/ej2-documenteditor",
"version": "21.2.3",
"version": "22.1.39",
"description": "Feature-rich document editor control with built-in support for context menu, options pane and dialogs.",
"keywords": [
"ej2",
Expand Down
2 changes: 1 addition & 1 deletion controls/documenteditor/src/document-editor-container/document-editor-container-model.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Property, INotifyPropertyChanged, NotifyPropertyChanges, ModuleDeclaration, L10n, Complex, isNullOrUndefined, formatUnit } from '@syncfusion/ej2-base';import { Event, EmitType } from '@syncfusion/ej2-base';import { Toolbar } from './tool-bar/tool-bar';import { DocumentEditor, DocumentEditorSettings, DocumentSettings } from '../document-editor/document-editor';import { TextProperties } from './properties-pane/text-properties-pane';import { HeaderFooterProperties } from './properties-pane/header-footer-pane';import { ImageProperties } from './properties-pane/image-properties-pane';import { TocProperties } from './properties-pane/table-of-content-pane';import { TableProperties } from './properties-pane/table-properties-pane';import { StatusBar } from './properties-pane/status-bar';import { ViewChangeEventArgs, RequestNavigateEventArgs, ContainerContentChangeEventArgs, ContainerSelectionChangeEventArgs, ContainerDocumentChangeEventArgs, CustomContentMenuEventArgs, BeforeOpenCloseCustomContentMenuEventArgs, BeforePaneSwitchEventArgs, LayoutType, CommentDeleteEventArgs, ServiceFailureArgs, CommentActionEventArgs, XmlHttpRequestEventArgs, RevisionActionEventArgs } from '../document-editor/base';import { createSpinner } from '@syncfusion/ej2-popups';import { ContainerServerActionSettingsModel, DocumentEditorSettingsModel, DocumentSettingsModel, FormFieldSettingsModel } from '../document-editor/document-editor-model';import { CharacterFormatProperties, ParagraphFormatProperties, SectionFormatProperties } from '../document-editor/implementation';import { ToolbarItem } from '../document-editor/base/types';import { CustomToolbarItemModel, TrackChangeEventArgs, FormFieldFillEventArgs, AutoResizeEventArgs } from '../document-editor/base/events-helper';import { ClickEventArgs } from '@syncfusion/ej2-navigations';import { beforeAutoResize, internalAutoResize, internalZoomFactorChange, beforeCommentActionEvent, commentDeleteEvent, contentChangeEvent, trackChangeEvent, beforePaneSwitchEvent, serviceFailureEvent, documentChangeEvent, selectionChangeEvent, customContextMenuSelectEvent, customContextMenuBeforeOpenEvent, internalviewChangeEvent, beforeXmlHttpRequestSend, protectionTypeChangeEvent, internalDocumentEditorSettingsChange, internalStyleCollectionChange, revisionActionEvent } from '../document-editor/base/constants';import { HelperMethods } from '../index';import { SanitizeHtmlHelper } from '@syncfusion/ej2-base';
import { Component, Property, INotifyPropertyChanged, NotifyPropertyChanges, ModuleDeclaration, L10n, Complex, isNullOrUndefined, formatUnit } from '@syncfusion/ej2-base';import { Event, EmitType } from '@syncfusion/ej2-base';import { Toolbar } from './tool-bar/tool-bar';import { DocumentEditor, DocumentEditorSettings, DocumentSettings } from '../document-editor/document-editor';import { TextProperties } from './properties-pane/text-properties-pane';import { HeaderFooterProperties } from './properties-pane/header-footer-pane';import { ImageProperties } from './properties-pane/image-properties-pane';import { TocProperties } from './properties-pane/table-of-content-pane';import { TableProperties } from './properties-pane/table-properties-pane';import { StatusBar } from './properties-pane/status-bar';import { ViewChangeEventArgs, RequestNavigateEventArgs, ContainerContentChangeEventArgs, ContainerSelectionChangeEventArgs, ContainerDocumentChangeEventArgs, CustomContentMenuEventArgs, BeforeOpenCloseCustomContentMenuEventArgs, BeforePaneSwitchEventArgs, LayoutType, CommentDeleteEventArgs, RevisionActionEventArgs, ServiceFailureArgs, CommentActionEventArgs, XmlHttpRequestEventArgs } from '../document-editor/base';import { createSpinner } from '@syncfusion/ej2-popups';import { ContainerServerActionSettingsModel, DocumentEditorSettingsModel, DocumentSettingsModel, FormFieldSettingsModel } from '../document-editor/document-editor-model';import { CharacterFormatProperties, ParagraphFormatProperties, SectionFormatProperties } from '../document-editor/implementation';import { ToolbarItem } from '../document-editor/base/types';import { CustomToolbarItemModel, TrackChangeEventArgs, FormFieldFillEventArgs, AutoResizeEventArgs } from '../document-editor/base/events-helper';import { ClickEventArgs } from '@syncfusion/ej2-navigations';import { beforeAutoResize, internalAutoResize, internalZoomFactorChange, beforeCommentActionEvent, commentDeleteEvent, contentChangeEvent, trackChangeEvent, beforePaneSwitchEvent, serviceFailureEvent, documentChangeEvent, selectionChangeEvent, customContextMenuSelectEvent, customContextMenuBeforeOpenEvent, internalviewChangeEvent, beforeXmlHttpRequestSend, protectionTypeChangeEvent, internalDocumentEditorSettingsChange, internalStyleCollectionChange, revisionActionEvent } from '../document-editor/base/constants';import { HelperMethods } from '../index';import { SanitizeHtmlHelper } from '@syncfusion/ej2-base';import { DialogUtility } from '@syncfusion/ej2-popups';
import {ComponentModel} from '@syncfusion/ej2-base';

/**
Expand Down
52 changes: 40 additions & 12 deletions controls/documenteditor/src/document-editor-container/document-editor-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ImageProperties } from './properties-pane/image-properties-pane';
import { TocProperties } from './properties-pane/table-of-content-pane';
import { TableProperties } from './properties-pane/table-properties-pane';
import { StatusBar } from './properties-pane/status-bar';
import { ViewChangeEventArgs, RequestNavigateEventArgs, ContainerContentChangeEventArgs, ContainerSelectionChangeEventArgs, ContainerDocumentChangeEventArgs, CustomContentMenuEventArgs, BeforeOpenCloseCustomContentMenuEventArgs, BeforePaneSwitchEventArgs, LayoutType, CommentDeleteEventArgs, ServiceFailureArgs, CommentActionEventArgs, XmlHttpRequestEventArgs, RevisionActionEventArgs } from '../document-editor/base';
import { ViewChangeEventArgs, RequestNavigateEventArgs, ContainerContentChangeEventArgs, ContainerSelectionChangeEventArgs, ContainerDocumentChangeEventArgs, CustomContentMenuEventArgs, BeforeOpenCloseCustomContentMenuEventArgs, BeforePaneSwitchEventArgs, LayoutType, CommentDeleteEventArgs, RevisionActionEventArgs, ServiceFailureArgs, CommentActionEventArgs, XmlHttpRequestEventArgs } from '../document-editor/base';
import { createSpinner } from '@syncfusion/ej2-popups';
import { ContainerServerActionSettingsModel, DocumentEditorSettingsModel, DocumentSettingsModel, FormFieldSettingsModel } from '../document-editor/document-editor-model';
import { CharacterFormatProperties, ParagraphFormatProperties, SectionFormatProperties } from '../document-editor/implementation';
Expand All @@ -19,7 +19,7 @@ import { ClickEventArgs } from '@syncfusion/ej2-navigations';
import { beforeAutoResize, internalAutoResize, internalZoomFactorChange, beforeCommentActionEvent, commentDeleteEvent, contentChangeEvent, trackChangeEvent, beforePaneSwitchEvent, serviceFailureEvent, documentChangeEvent, selectionChangeEvent, customContextMenuSelectEvent, customContextMenuBeforeOpenEvent, internalviewChangeEvent, beforeXmlHttpRequestSend, protectionTypeChangeEvent, internalDocumentEditorSettingsChange, internalStyleCollectionChange, revisionActionEvent } from '../document-editor/base/constants';
import { HelperMethods } from '../index';
import { SanitizeHtmlHelper } from '@syncfusion/ej2-base';

import { DialogUtility } from '@syncfusion/ej2-popups';
/**
* Document Editor container component.
*/
Expand Down Expand Up @@ -605,7 +605,13 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
'Columns': 'Columns',
'Column': 'Column',
'Page Breaks': 'Page Breaks',
'Section Breaks': 'Section Breaks'
'Section Breaks': 'Section Breaks',
'Link to Previous': 'Link to Previous',
'Link to PreviousTooltip': 'Link this section with previous section header or footer',
'Alternate Text': 'Alternate Text',
'The address of this site is not valid. Check the address and try again.' : 'The address of this site is not valid. Check the address and try again.',
'OK':'OK',
'Information':'Information'
};
/* eslint-enable @typescript-eslint/naming-convention */
/**
Expand Down Expand Up @@ -881,12 +887,19 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
if(!isNullOrUndefined(this.documentEditorSettings.maximumRows)) {
this.documentEditor.documentEditorSettings.maximumRows = this.documentEditorSettings.maximumRows;
}
if(!isNullOrUndefined(this.documentEditorSettings.maximumColumns)) {
this.documentEditor.documentEditorSettings.maximumColumns = this.documentEditorSettings.maximumColumns;
}
if(!isNullOrUndefined(this.documentEditorSettings.showHiddenMarks)) {
this.documentEditor.documentEditorSettings.showHiddenMarks = this.documentEditorSettings.showHiddenMarks;
}
if (!isNullOrUndefined(this.documentEditorSettings.showBookmarks)) {
this.documentEditor.documentEditorSettings.showBookmarks = this.documentEditorSettings.showBookmarks;
}
if(!isNullOrUndefined(this.documentEditorSettings.highlightEditableRanges)){
this.documentEditor.documentEditorSettings.highlightEditableRanges = this.documentEditorSettings.highlightEditableRanges;
}

if (!isNullOrUndefined(this.documentEditorSettings.allowDragAndDrop)) {
this.documentEditor.documentEditorSettings.allowDragAndDrop = this.documentEditorSettings.allowDragAndDrop;
}
Expand Down Expand Up @@ -988,6 +1001,7 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
width: '100%',
enableTrackChanges: this.enableTrackChanges,
showRevisions: true,
showComments: true,
enableLockAndEdit: this.enableLockAndEdit,
enableAutoFocus: this.enableAutoFocus
});
Expand Down Expand Up @@ -1165,8 +1179,9 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
public onSelectionChange(): void {
setTimeout(() => {
this.showPropertiesPaneOnSelection();
let eventArgs: ContainerSelectionChangeEventArgs = { source: this };
let eventArgs: ContainerSelectionChangeEventArgs = { source: this , isCompleted: this.documentEditor.documentHelper.isSelectionCompleted};
this.trigger(selectionChangeEvent, eventArgs);
this.documentEditor.documentHelper.isSelectionCompleted = true;
});
}
/**
Expand All @@ -1186,11 +1201,26 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
*/
private onRequestNavigate(args: RequestNavigateEventArgs): void {
if (args.linkType !== 'Bookmark') {
let link: string = SanitizeHtmlHelper.sanitize(args.navigationLink);
const navLink = args.navigationLink;
let link: string = SanitizeHtmlHelper.sanitize(navLink);
if (args.localReference.length > 0) {
link += '#' + args.localReference;
}
window.open(link);
if (navLink.substring(0, 8) === 'file:///'
|| (navLink.substring(0, 7) === 'http://' && navLink.length > 7)
|| (navLink.substring(0, 8) === 'https://' && navLink.length > 8)
|| (navLink.substring(0, 4) === 'www.' && navLink.length > 4)
|| (navLink.substring(0, 7) === 'mailto:' && navLink.length > 7)) {
window.open(link);
}
else {
DialogUtility.alert({
title: this.localObj.getConstant("Information"),
content: this.localObj.getConstant("The address of this site is not valid. Check the address and try again."),
okButton: { text: this.localObj.getConstant("OK") },
closeOnEscape: true,
});
}
args.isHandled = true;
}
}
Expand Down Expand Up @@ -1320,19 +1350,17 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
public destroy(): void {
super.destroy();
if (this.element) {
if (!this.refreshing) {
this.element.classList.remove('e-documenteditorcontainer');
}
this.element.innerHTML = '';
}
if (!this.refreshing) {
this.element.classList.remove('e-documenteditorcontainer');
this.element = undefined;
this.paragraphFormat = undefined;
this.sectionFormat = undefined;
this.characterFormat = undefined;
}
if (this.toolbarModule) {
this.toolbarModule.destroy();
this.toolbarModule = undefined;
}
if (this.toolbarContainer && this.toolbarContainer.parentElement) {
this.toolbarContainer.innerHTML = '';
this.toolbarContainer.parentElement.removeChild(this.toolbarContainer);
Expand Down Expand Up @@ -1385,4 +1413,4 @@ export class DocumentEditorContainer extends Component<HTMLElement> implements I
this.statusBar = undefined;
this.previousContext = undefined;
}
}
}
69 changes: 69 additions & 0 deletions controls/documenteditor/src/document-editor-container/properties-pane/header-footer-pane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { NumericTextBox } from '@syncfusion/ej2-inputs';
import { Toolbar } from '../tool-bar/tool-bar';
import { DocumentEditorContainer } from '../document-editor-container';
import { DocumentEditor } from '../../document-editor/document-editor';
import { HeaderFooterWidget } from '../../document-editor/implementation/viewer';
/**
* @private
*/
Expand All @@ -16,6 +17,7 @@ export class HeaderFooterProperties {
private container: DocumentEditorContainer;
private firstPage: CheckBox;
private oddOrEven: CheckBox;
private linkToPrevious: CheckBox;
private pageNumber: CheckBox;
private pageCount: CheckBox;
private headerFromTop: NumericTextBox;
Expand Down Expand Up @@ -111,11 +113,18 @@ export class HeaderFooterProperties {
this.firstPage.appendTo(firstPage);
firstPageDiv.children[0].setAttribute('title', localObj.getConstant('Different header and footer for first page'));
const oddOrEvenDiv: HTMLElement = this.createDivTemplate(elementId + '_oddOrEvenDiv', optionsDiv);
classList(oddOrEvenDiv, ['e-de-hdr-ftr-frst-div'], []);
const oddOrEven: HTMLInputElement = createElement('input', { id: 'oddOrEven', className: 'e-de-sub-prop-label' }) as HTMLInputElement;
oddOrEvenDiv.appendChild(oddOrEven);
this.oddOrEven = new CheckBox({ label: localObj.getConstant('Different Odd And Even Pages'), change: this.changeoddOrEvenOptions.bind(this), cssClass: 'e-de-prop-sub-label', enableRtl: this.isRtl });
this.oddOrEven.appendTo(oddOrEven);
oddOrEvenDiv.children[0].setAttribute('title', localObj.getConstant('Different header and footer for odd and even pages'));
const linkToPreviousDiv: HTMLElement = this.createDivTemplate(elementId + '_linkToPreviousDiv', optionsDiv);
const linkToPrevious: HTMLInputElement = createElement('input', { id: 'linkToPrevious', className: 'e-de-sub-prop-label' }) as HTMLInputElement;
linkToPreviousDiv.appendChild(linkToPrevious);
this.linkToPrevious = new CheckBox({ label: localObj.getConstant('Link to Previous'), change: this.changeLinkToPreviousOptions.bind(this) ,cssClass: 'e-de-prop-sub-label', enableRtl: this.isRtl, checked: true });
this.linkToPrevious.appendTo(linkToPrevious);
linkToPreviousDiv.children[0].setAttribute('title', localObj.getConstant('Link to the previous Title'));
// let autoFieldLabelDiv: HTMLElement = this.createDivTemplate(element + '_autoFieldLabelDiv', div, 'padding-top:10px;padding-left: 10px;');
// let autoFieldLabel: HTMLElement = createElement('label', { className: 'e-de-header-prop-label', styles: 'height:20px;' });
// autoFieldLabel.innerHTML = 'Insert Autofield';
Expand Down Expand Up @@ -222,6 +231,36 @@ export class HeaderFooterProperties {
}, 10);
}
}
private changeLinkToPreviousOptions(): void {
if (!this.documentEditor.isReadOnly) {
let headerFooterType: any = ((this.documentEditor.selection.start.paragraph.containerWidget) as HeaderFooterWidget).headerFooterType;
let value: boolean = this.linkToPrevious.checked;
switch (headerFooterType) {
case 'OddHeader':
this.documentEditor.selection.sectionFormat.oddPageHeader.linkToPrevious = value;
break;
case 'OddFooter':
this.documentEditor.selection.sectionFormat.oddPageFooter.linkToPrevious = value;
break;
case 'EvenHeader':
this.documentEditor.selection.sectionFormat.evenPageHeader.linkToPrevious = value;
break;
case 'EvenFooter':
this.documentEditor.selection.sectionFormat.evenPageFooter.linkToPrevious = value;
break;
case 'FirstPageHeader':
this.documentEditor.selection.sectionFormat.firstPageHeader.linkToPrevious = value;
break;
case 'FirstPageFooter':
this.documentEditor.selection.sectionFormat.firstPageFooter.linkToPrevious = value;
break;

}
setTimeout((): void => {
this.documentEditor.focusIn();
}, 10);
}
}
private changeHeaderValue(): void {
if (!this.isHeaderTopApply) {
return;
Expand Down Expand Up @@ -273,6 +312,32 @@ export class HeaderFooterProperties {
} else {
this.oddOrEven.checked = false;
}
if (this.documentEditor.selection.start.paragraph.bodyWidget.sectionIndex == 0) {
this.linkToPrevious.disabled = true;
} else {
this.linkToPrevious.disabled = false;
let headerFooterType: any = ((this.documentEditor.selection.start.paragraph.containerWidget) as HeaderFooterWidget).headerFooterType;
switch (headerFooterType) {
case 'OddHeader':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.oddPageHeader.linkToPrevious;
break;
case 'OddFooter':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.oddPageFooter.linkToPrevious;
break;
case 'EvenHeader':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.evenPageHeader.linkToPrevious;
break;
case 'EvenFooter':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.evenPageFooter.linkToPrevious;
break;
case 'FirstPageHeader':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.firstPageHeader.linkToPrevious;
break;
case 'FirstPageFooter':
this.linkToPrevious.checked = this.documentEditor.selection.sectionFormat.firstPageFooter.linkToPrevious;
break;
}
}
}
public destroy(): void {
if (this.element) {
Expand All @@ -290,6 +355,10 @@ export class HeaderFooterProperties {
this.oddOrEven.destroy();
}
this.oddOrEven = undefined;
if (this.linkToPrevious) {
this.linkToPrevious.destroy();
}
this.linkToPrevious = undefined;
if (this.headerFromTop) {
this.headerFromTop.destroy();
this.headerFromTop = undefined;
Expand Down
Loading