ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2689 from FinnStutzenstein/lineNumberFix

Browse Source 
Missing changes from PR 2678
This commit is contained in:
Norman Jäckel 2016-11-28 20:37:05 +01:00 committed by GitHub
commit 7e45e8a9a5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openslides/motions/static/js/motions/projector.js
View File

@ -39,11 +39,17 @@ angular.module('OpenSlidesApp.motions.projector', [
// (if this check is removed this happends: controller loads --> call of $scope.scroll // (if this check is removed this happends: controller loads --> call of $scope.scroll
// --> same line but scrollRequest --> projector updates --> controller loads --> ... ) // --> same line but scrollRequest --> projector updates --> controller loads --> ... )
if ($scope.line !== $rootScope.motion_projector_line) { if ($scope.line !== $rootScope.motion_projector_line) {
// line value has changed // The same line number can occur twice in diff view; we scroll to the first one in this case
var lineElement = document.getElementsByName('L' + $scope.line); var scrollTop = null;
if (lineElement[0]) { $(".line-number-" + $scope.line).each(function() {
var top = $(this).offset().top;
if (top > 0 && (scrollTop === null || top < scrollTop)) {
scrollTop = top;
}
});
if (scrollTop) {
$rootScope.motion_projector_line = $scope.line; $rootScope.motion_projector_line = $scope.line;
var pos = lineElement[0].getBoundingClientRect().top + thisProjector.scroll*80; var pos = scrollTop + thisProjector.scroll*80;
$http.post('/rest/core/projector/' + thisProjector.id + '/set_scroll/', Math.floor(pos/80.0) - 1); $http.post('/rest/core/projector/' + thisProjector.id + '/set_scroll/', Math.floor(pos/80.0) - 1);
} else if ($scope.line === 0) { } else if ($scope.line === 0) {
$rootScope.motion_projector_line = $scope.line; $rootScope.motion_projector_line = $scope.line;