Skip to content

[Optimization] Code editor key binding event optimization. #1287

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.

Sign up for GitHub

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

Closed
cloverhearts wants to merge 6 commits into from
Closed

[Optimization] Code editor key binding event optimization. #1287

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b37788d
Code editor key binding event optimization.
cloverhearts Aug 5, 2016
8cc63b7
fixed syntax error for editor key binding optimization.
cloverhearts Aug 5, 2016
6a9edbe
change access type $scope access member to local variable and add las…
cloverhearts Aug 5, 2016
e4c37b1
move to original key bind function for codeeditor optimiza
cloverhearts Aug 5, 2016
27f7146
Modify the style syntax for code editor
cloverhearts Aug 5, 2016
76cd284
paragraph move jum bug fixed.
cloverhearts Aug 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,19 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
$scope.editor.commands.bindKey('ctrl-.', 'startAutocomplete');
$scope.editor.commands.bindKey('ctrl-space', null);

var keyBindingEditorFocusAction = function(scrollValue) {
var numRows = $scope.editor.getSession().getLength();
var currentRow = $scope.editor.getCursorPosition().row;
if (currentRow === 0 && scrollValue <= 0) {
// move focus to previous paragraph
$scope.$emit('moveFocusToPreviousParagraph', $scope.paragraph.id);
} else if (currentRow === numRows - 1 && scrollValue >= 0) {
$scope.$emit('moveFocusToNextParagraph', $scope.paragraph.id);
} else {
$scope.scrollToCursor($scope.paragraph.id, scrollValue);
}
};

// handle cursor moves
$scope.editor.keyBinding.origOnCommandKey = $scope.editor.keyBinding.onCommandKey;
$scope.editor.keyBinding.onCommandKey = function(e, hashId, keyCode) {
Expand All @@ -678,27 +691,26 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
angular.element('#' + $scope.paragraph.id + '_editor > textarea').css('top', cursorPos.top);
}

var numRows;
var currentRow;
var ROW_UP = -1;
var ROW_DOWN = 1;

Copy link
Contributor

@corneadoug corneadoug Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot this case in your function above

Copy link
Member Author

@cloverhearts cloverhearts Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@corneadoug
Thanks Giving find.
I will fix.

Copy link
Member Author

@cloverhearts cloverhearts Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@corneadoug
Modifications completed.

if (currentRow === 0 || (currentRow === numRows - 1)) {

if (keyCode === 38 || (keyCode === 80 && e.ctrlKey && !e.altKey)) { // UP
numRows = $scope.editor.getSession().getLength();
currentRow = $scope.editor.getCursorPosition().row;
if (currentRow === 0) {
// move focus to previous paragraph
$scope.$emit('moveFocusToPreviousParagraph', $scope.paragraph.id);
} else {
$scope.scrollToCursor($scope.paragraph.id, -1);
}
} else if (keyCode === 40 || (keyCode === 78 && e.ctrlKey && !e.altKey)) { // DOWN
numRows = $scope.editor.getSession().getLength();
currentRow = $scope.editor.getCursorPosition().row;
if (currentRow === numRows - 1) {
// move focus to next paragraph
$scope.$emit('moveFocusToNextParagraph', $scope.paragraph.id);
} else {
$scope.scrollToCursor($scope.paragraph.id, 1);
}
switch (keyCode) {
case 38:
keyBindingEditorFocusAction(ROW_UP);
break;
case 80:
if (e.ctrlKey && !e.altKey) {
keyBindingEditorFocusAction(ROW_UP);
}
break;
case 40:
keyBindingEditorFocusAction(ROW_DOWN);
break;
case 78:
if (e.ctrlKey && !e.altKey) {
keyBindingEditorFocusAction(ROW_DOWN);
}
break;
}
}
this.origOnCommandKey(e, hashId, keyCode);
Expand Down