Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-06 21:36:05 +01:00
Code Issues Packages Projects Releases Activity

Fix rest parameters

Browse Source
This commit is contained in:
Sauli Anto
2019-10-03 12:43:46 +03:00
parent b7ccab38ff
commit 6ea1c38e24
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/automath.js
View File

@@ -58,10 +58,7 @@ export default class AutoMath extends Plugin {
_mathBetweenPositions( leftPosition, rightPosition ) { _mathBetweenPositions( leftPosition, rightPosition ) {
const editor = this.editor; const editor = this.editor;
const mathConfig = { const mathConfig = Object.assign( defaultConfig, this.editor.config.get( 'math' ) );
...defaultConfig,
...this.editor.config.get( 'math' )
};
const equationRange = new LiveRange( leftPosition, rightPosition ); const equationRange = new LiveRange( leftPosition, rightPosition );
const walker = equationRange.getWalker( { ignoreElementEnd: true } ); const walker = equationRange.getWalker( { ignoreElementEnd: true } );
@@ -106,10 +103,9 @@ export default class AutoMath extends Plugin {
} }
editor.model.change( writer => { editor.model.change( writer => {
const params = { const params = Object.assign( extractDelimiters( text ), {
...extractDelimiters( text ), type: mathConfig.outputType
type: mathConfig.outputType, } );
};
const mathElement = writer.createElement( 'mathtex', params ); const mathElement = writer.createElement( 'mathtex', params );
editor.model.insertContent( mathElement, insertPosition ); editor.model.insertContent( mathElement, insertPosition );

10
src/mathediting.js
View File

@@ -36,10 +36,7 @@ export default class MathEditing extends Plugin {
_defineConverters() { _defineConverters() {
const conversion = this.editor.conversion; const conversion = this.editor.conversion;
const mathConfig = { const mathConfig = Object.assign( defaultConfig, this.editor.config.get( 'math' ) );
...defaultConfig,
...this.editor.config.get( 'math' )
};
// View -> Model // View -> Model
conversion.for( 'upcast' ) conversion.for( 'upcast' )
@@ -86,10 +83,9 @@ export default class MathEditing extends Plugin {
model: ( viewElement, modelWriter ) => { model: ( viewElement, modelWriter ) => {
const equation = viewElement.getChild( 0 ).data.trim(); const equation = viewElement.getChild( 0 ).data.trim();
const params = { const params = Object.assign( extractDelimiters( equation ), {
...extractDelimiters( equation ),
type: mathConfig.forceOutputType ? mathConfig.outputType : 'span' type: mathConfig.forceOutputType ? mathConfig.outputType : 'span'
}; } );
return modelWriter.createElement( 'mathtex', params ); return modelWriter.createElement( 'mathtex', params );
} }

5
src/mathui.js
View File

@@ -59,10 +59,7 @@ export default class MathUI extends Plugin {
const editor = this.editor; const editor = this.editor;
const mathCommand = editor.commands.get( 'math' ); const mathCommand = editor.commands.get( 'math' );
const mathConfig = { const mathConfig = Object.assign( defaultConfig, this.editor.config.get( 'math' ) );
...defaultConfig,
...this.editor.config.get( 'math' )
};
const formView = new MainFormView( editor.locale, mathConfig.engine, mathConfig.enablePreview ); const formView = new MainFormView( editor.locale, mathConfig.engine, mathConfig.enablePreview );