-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
IT-5528 | Fixes after upstream update #10
Changes from all commits
1cc5e11
9bb53dd
fd6a70b
6374833
4e557e4
5c55552
bf6dc88
6473821
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,14 @@ | ||
import { icons } from 'ckeditor5/src/core'; | ||
import { | ||
ButtonView, createLabeledInputText, FocusCycler, LabelView, LabeledFieldView, | ||
submitHandler, SwitchButtonView, View, ViewCollection | ||
ButtonView, | ||
createLabeledTextarea, | ||
FocusCycler, | ||
LabeledFieldView, | ||
LabelView, | ||
submitHandler, | ||
SwitchButtonView, | ||
View, | ||
ViewCollection | ||
} from 'ckeditor5/src/ui'; | ||
import { FocusTracker, KeystrokeHandler } from 'ckeditor5/src/utils'; | ||
import { extractDelimiters, hasDelimiters } from '../utils'; | ||
|
@@ -166,8 +173,9 @@ export default class MainFormView extends View { | |
const t = this.locale.t; | ||
|
||
// Create equation input | ||
const mathInput = new LabeledFieldView( this.locale, createLabeledInputText ); | ||
const mathInput = new LabeledFieldView( this.locale, createLabeledTextarea ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bring back textarea that we lost when resolving conflicts: https://github.com/bethinkpl/ckeditor5-math/pull/9/files#diff-2efc953309779ec3dc248aac8e35081f80c768c7ad0c8ef8bdaea55cd044e156L179 |
||
const fieldView = mathInput.fieldView; | ||
fieldView.set( 'resize', 'both' ); | ||
mathInput.infoText = t( 'Insert equation in TeX format.' ); | ||
|
||
const onInput = () => { | ||
|
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
@@ -1,6 +1,6 @@ | ||||
import InputView from '@ckeditor/ckeditor5-ui/src/input/inputview'; | ||||
import { View } from 'ckeditor5/src/ui'; | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FIx import, after changing
ckeditor5-math/src/ui/mathliveview.js Line 14 in 9bb53dd
|
||||
|
||||
export default class MathLiveView extends InputView { | ||||
export default class MathLiveView extends View { | ||||
constructor( locale, { options, attributes } ) { | ||||
super( locale ); | ||||
this._options = options; | ||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,6 +36,7 @@ | |
padding: 16px; | ||
|
||
& .ck-input { | ||
overflow: auto; | ||
width: 100%; | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was a part of isaul32@fffb69b but not 41f075f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Without it, I was getting error about node 20 not being supported.