Skip to content

ZEPPELIN-467 Fix ace editor focusing problem in chrome #482

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
Leemoonsoo wants to merge 2 commits into from
Closed

ZEPPELIN-467 Fix ace editor focusing problem in chrome #482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ba168
Fix ace editor focusing problem
Leemoonsoo Nov 26, 2015
434b5b2
Avoid repeating angular.element('body')
Leemoonsoo Nov 27, 2015
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
22 changes: 16 additions & 6 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 @@ -615,7 +615,11 @@ angular.module('zeppelinWebApp')
if ($scope.editor.completer && $scope.editor.completer.activated) { // if autocompleter is active
} else {
// fix ace editor focus issue in chrome (textarea element goes to top: -1000px after focused by cursor move)
angular.element('#' + $scope.paragraph.id + '_editor > textarea').css('top', 0);
if (parseInt(angular.element('#' + $scope.paragraph.id + '_editor > textarea').css('top').replace('px', '')) < 0) {
var position = $scope.editor.getCursorPosition();
var cursorPos = $scope.editor.renderer.$cursorLayer.getPixelPosition(position, true);
angular.element('#' + $scope.paragraph.id + '_editor > textarea').css('top', cursorPos.top);
}

var numRows;
var currentRow;
Expand Down Expand Up @@ -683,7 +687,7 @@ angular.module('zeppelinWebApp')
var position = $scope.editor.getCursorPosition();
var lastCursorPosition = $scope.editor.renderer.$cursorLayer.getPixelPosition(position, true);

var calculatedCursorPosition = editorPosition.top + lastCursorPosition.top + 16*lastCursorMove;
var calculatedCursorPosition = editorPosition.top + lastCursorPosition.top + lineHeight*lastCursorMove;

var scrollTargetPos;
if (calculatedCursorPosition < scrollPosition + headerHeight + scrollTriggerEdgeMargin) {
Expand All @@ -698,7 +702,14 @@ angular.module('zeppelinWebApp')
scrollTargetPos = documentHeight;
}
}
angular.element('body').scrollTo(scrollTargetPos, {axis: 'y', interrupt: true, duration:200});

// cancel previous scroll animation
var bodyEl = angular.element('body');
bodyEl.stop();
bodyEl.finish();

// scroll to scrollTargetPos
bodyEl.scrollTo(scrollTargetPos, {axis: 'y', interrupt: true, duration:100});
};

var setEditorHeight = function(id, height) {
Expand Down Expand Up @@ -752,11 +763,10 @@ angular.module('zeppelinWebApp')
var row;
if (cursorPos >= 0) {
row = cursorPos;
var column = 0;
$scope.editor.gotoLine(row, 0);
} else {
row = $scope.editor.session.getLength() - 1;
$scope.editor.gotoLine(row + 1, 0);
row = $scope.editor.session.getLength();
$scope.editor.gotoLine(row, 0);
}
$scope.scrollToCursor($scope.paragraph.id, 0);
}
Expand Down