1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-04 19:16:07 +02:00

Contain autocomplete in StatusBarWidget.js

StatusBarWidget.js now imports app itself and gets command names.
app-gui.js no longer sets the autocomplete of StatusBarWidget itself.
This commit is contained in:
Gabe Cohen 2017-12-11 19:31:11 -06:00
parent cda623a95c
commit 671e538740
2 changed files with 8 additions and 10 deletions

View File

@ -206,10 +206,7 @@ class AppGui {
};
consoleWidget.hide();
const statusBar = new StatusBarWidget();
this.app().commandNames().then((names)=>{
statusBar.setAutoComplete(names);
});
const statusBar = new StatusBarWidget();
statusBar.hStretch = true;
const noteLayout = new VLayoutWidget();

View File

@ -2,17 +2,21 @@ const BaseWidget = require('tkwidgets/BaseWidget.js');
const chalk = require('chalk');
const termutils = require('tkwidgets/framework/termutils.js');
const stripAnsi = require('strip-ansi');
const { app } = require('../app.js');
class StatusBarWidget extends BaseWidget {
constructor(autoComplete = null) {
constructor() {
super();
this.promptState_ = null;
this.inputEventEmitter_ = null;
this.history_ = [];
this.items_ = [];
this.autoComplete = autoComplete;
this.autocomplete_ = null;
app().commandNames().then(function(names){
this.autocomplete_ = names;
}.bind(this));
}
get name() {
@ -23,9 +27,6 @@ class StatusBarWidget extends BaseWidget {
return false;
}
setAutoComplete(auto) {
this.autoComplete = auto;
}
setItemAt(index, text) {
this.items_[index] = stripAnsi(text).trim();
this.invalidate();
@ -112,7 +113,7 @@ class StatusBarWidget extends BaseWidget {
cancelable: true,
history: this.history,
default: this.promptState_.initialText,
autoComplete: this.autoComplete,
autoComplete: this.autocomplete_,
autoCompleteMenu: true,
autoCompleteHint : true,
};