OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

clean up 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-07-15 09:49:02 +01:00
parent 8812f98b35
commit 2bf5e4b142
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/editor/model.ts
View File

@ -21,6 +21,7 @@ import Range from "./range";
import {BasePart, ISerializedPart, PartCreator} from "./parts"; import {BasePart, ISerializedPart, PartCreator} from "./parts";
import AutocompleteWrapperModel, {ICallback} from "./autocomplete"; import AutocompleteWrapperModel, {ICallback} from "./autocomplete";
import DocumentOffset from "./offset"; import DocumentOffset from "./offset";
import {Caret} from "./caret";
/** /**
* @callback ModelCallback * @callback ModelCallback
@ -43,9 +44,9 @@ import DocumentOffset from "./offset";
* @return the caret position * @return the caret position
*/ */
type TransformCallback = (caretPosition: IPosition, inputType: string, diff: IDiff) => number | void; type TransformCallback = (caretPosition: DocumentPosition, inputType: string, diff: IDiff) => number | void;
type UpdateCallback = (caret: Range | IPosition, inputType?: string, diff?: IDiff) => void; type UpdateCallback = (caret: Caret, inputType?: string, diff?: IDiff) => void;
type ManualTransformCallback = () => Range | DocumentPosition; type ManualTransformCallback = () => Caret;
export default class EditorModel { export default class EditorModel {
private _parts: BasePart[]; private _parts: BasePart[];
@ -157,7 +158,7 @@ export default class EditorModel {
} }
} }
reset(serializedParts: ISerializedPart[], caret: Range | IPosition, inputType: string) { reset(serializedParts: ISerializedPart[], caret: Caret, inputType: string) {
this._parts = serializedParts.map(p => this._partCreator.deserializePart(p)); this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
if (!caret) { if (!caret) {
caret = this.getPositionAtEnd(); caret = this.getPositionAtEnd();
@ -214,7 +215,7 @@ export default class EditorModel {
return acPromise; return acPromise;
} }
private getTransformAddedLen(newPosition: IPosition, inputType: string, diff: IDiff): number { private getTransformAddedLen(newPosition: DocumentPosition, inputType: string, diff: IDiff): number {
const result = this.transformCallback(newPosition, inputType, diff); const result = this.transformCallback(newPosition, inputType, diff);
return Number.isFinite(result) ? result as number : 0; return Number.isFinite(result) ? result as number : 0;
} }