slap-editor/slap
1
1
Fork 0
mirror of https://github.com/slap-editor/slap.git synced 2024-08-15 15:50:32 +03:00
Code Issues Projects Releases Wiki Activity

Submitting the goLine form should not add a newline

Browse Source 
Moved next and prev to findForm, where multiple results are possible
Prevented the enter keypress event from being transferred to the editor
This commit is contained in:
Daniel Perrett 2016-11-09 18:35:58 +00:00
parent 61bf6bb11f
commit d8d64c6a91
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ui/BaseFindForm.js
View File

@ -59,13 +59,6 @@ BaseFindForm.prototype._initHandlers = function () {
});
textBuf.onDidChange(function () { self.find(textBuf.getText()); });
self.findField.on('keypress', function (ch, key) {
var text = textBuf.getText();
switch (self.resolveBinding(key)) {
case 'next': self.find(text, 1); return false;
case 'prev': self.find(text, -1); return false;
};
});
return BaseForm.prototype._initHandlers.apply(self, arguments);
};

9
lib/ui/FindForm.js
View File

@ -96,6 +96,15 @@ FindForm.prototype._initHandlers = function () {
}
editor._updateContent();
}, self.options.perf.findThrottle));
self.findField.on('keypress', function (ch, key) {
var text = self.findField.textBuf.getText();
switch (self.resolveBinding(key)) {
case 'next': self.find(text, 1); return false;
case 'prev': self.find(text, -1); return false;
};
});
return BaseFindForm.prototype._initHandlers.apply(self, arguments);
};

12
lib/ui/GoLineForm.js
View File

@ -30,6 +30,18 @@ GoLineForm.prototype.__proto__ = BaseFindForm.prototype;
GoLineForm.prototype._initHandlers = function () {
var self = this;
self.findField.on('keypress', function (ch, key) {
var lineNumber = self.findField.textBuf.getText();
switch (self.resolveBinding(key)) {
// Use setTimeout as a horrible hack to prevent
// the keypress from being transferred to the editor,
// causing an unintentional extra linebreak.
case 'next': setTimeout(function(){ self.find(lineNumber, 1) }, 1); return false;
case 'submit': setTimeout(function(){ self.find(lineNumber, 1) }, 1); return false;
};
});
self.on('cancel', function () { self.resetEditor(); });
self.on('show', function () { self.findField.textBuf.setText(''); });
self.on('find', function (lineNumber, direction) {