Skip to content

Use RawElement instead of UIElement in editor view, and instead of ContainerElement in data view #47

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
Jules-Bertholet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use RawElement instead of UIElement in editor view, and instead of ContainerElement in data view #47

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
54 changes: 27 additions & 27 deletions src/mathediting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,24 @@ export default class MathEditing extends Plugin {
const styles = 'user-select: none; ' + ( display ? '' : 'display: inline-block;' );
const classes = 'ck-math-tex ' + ( display ? 'ck-math-tex-display' : 'ck-math-tex-inline' );

const mathtexView = writer.createContainerElement( display ? 'div' : 'span', {
style: styles,
class: classes
} );

const uiElement = writer.createUIElement( 'div', null, function( domDocument ) {
const domElement = this.toDomElement( domDocument );

renderEquation( equation, domElement, mathConfig.engine, mathConfig.lazyLoad, display, false );

return domElement;
} );
const mathtexView = writer.createContainerElement(
display ? 'div' : 'span',
{
style: styles,
class: classes
}
);

const rawElement = writer.createRawElement(
'div',
null,
domElement => {
renderEquation( equation, domElement, mathConfig.engine, mathConfig.lazyLoad, display, false );
return domElement;
}
);

writer.insert( writer.createPositionAt( mathtexView, 0 ), uiElement );
writer.insert( writer.createPositionAt( mathtexView, 0 ), rawElement );

return mathtexView;
}
Expand All @@ -185,23 +189,19 @@ export default class MathEditing extends Plugin {
const display = modelItem.getAttribute( 'display' );

if ( type === 'span' ) {
const mathtexView = writer.createContainerElement( 'span', {
class: 'math-tex'
} );

if ( display ) {
writer.insert( writer.createPositionAt( mathtexView, 0 ), writer.createText( '\\[' + equation + '\\]' ) );
} else {
writer.insert( writer.createPositionAt( mathtexView, 0 ), writer.createText( '\\(' + equation + '\\)' ) );
}
const mathtexView = writer.createRawElement(
'span',
{ class: 'math-tex' },
domElement => { domElement.innerHTML = display ? '\\[' + equation + '\\]' : '\\(' + equation + '\\)'; }
);

return mathtexView;
} else {
const mathtexView = writer.createContainerElement( 'script', {
type: display ? 'math/tex; mode=display' : 'math/tex'
} );

writer.insert( writer.createPositionAt( mathtexView, 0 ), writer.createText( equation ) );
const mathtexView = writer.createRawElement(
'script',
{ type: display ? 'math/tex; mode=display' : 'math/tex' },
domElement => { domElement.innerHTML = equation; }
);

return mathtexView;
}
Expand Down