ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-05 17:23:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support position property in editor component (#2314)

Browse Source 
* Support position property in editor component
- This needs to be set directly on the editor component so cannot just use CSSStyles feature
- Given its importance to this scenario, it also warrants a dedicated property.

* Fix window resize when action bar clicked

* Renamed per Abbie's suggestion

* Changed name to clarify the comments
This commit is contained in:
Kevin Cunnane
2018-08-23 17:32:13 -07:00
committed by GitHub
parent 4ab5d84b94
commit 2bfc3a6c85
6 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/parts/modelComponents/editor.component.ts
View File

@@ -33,7 +33,7 @@ export default class EditorComponent extends ComponentBase implements IComponent
private _editorInput: UntitledEditorInput;
private _editorModel: ITextModel;
private _renderedContent: string;
private _langaugeMode: string;
private _languageMode: string;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@@ -76,10 +76,13 @@ export default class EditorComponent extends ComponentBase implements IComponent
public layout(): void {
let width: number = this.convertSizeToNumber(this.width);
let height: number = this.convertSizeToNumber(this.height);
this._editor.layout(new DOM.Dimension(
width && width > 0 ? width : DOM.getContentWidth(this._el.nativeElement),
height && height > 0 ? height : DOM.getContentHeight(this._el.nativeElement)));
let element = <HTMLElement> this._el.nativeElement;
element.style.position = this.position;
}
/// Editor Functions
@@ -92,8 +95,8 @@ export default class EditorComponent extends ComponentBase implements IComponent
private updateLanguageMode() {
if (this._editorModel && this._editor) {
this._langaugeMode = this.languageMode;
this._modeService.getOrCreateMode(this._langaugeMode).then((modeValue) => {
this._languageMode = this.languageMode;
this._modeService.getOrCreateMode(this._languageMode).then((modeValue) => {
this._modelService.setMode(this._editorModel, modeValue);
});
}
@@ -111,7 +114,7 @@ export default class EditorComponent extends ComponentBase implements IComponent
if (this.content !== this._renderedContent) {
this.updateModel();
}
if (this.languageMode !== this._langaugeMode) {
if (this.languageMode !== this._languageMode) {
this.updateLanguageMode();
}
}
@@ -132,4 +135,12 @@ export default class EditorComponent extends ComponentBase implements IComponent
public set languageMode(newValue: string) {
this.setPropertyFromUI<sqlops.EditorProperties, string>((properties, languageMode) => { properties.languageMode = languageMode; }, newValue);
}
public get position(): string {
return this.getPropertyOrDefault<sqlops.EditorProperties, string>((props) => props.position, '');
}
public set position(newValue: string) {
this.setPropertyFromUI<sqlops.EditorProperties, string>((properties, position) => { properties.languoffsetMarginageMode = position; }, newValue);
}
}