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

Merge pull request #4510 from CatoTH/OS3-Line-Highlighting-Bugfixes

Browse Source 
Bugfixes: Highlighting wo CRs, better scrolling
This commit is contained in:
Emanuel Schütze 2019-03-16 20:39:39 +01:00 committed by GitHub
commit 5482157536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/core/ui-services/diff.service.ts
View File

@ -2208,7 +2208,7 @@ export class DiffService {
}
}, 0);
const numberedHtml = this.lineNumberingService.insertLineNumbers(motionHtml, lineLength);
const numberedHtml = this.lineNumberingService.insertLineNumbers(motionHtml, lineLength, highlight);
if (changes.length === 0) {
return numberedHtml;
}

30
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
View File

@ -172,7 +172,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
/**
* All change recommendations AND amendments, sorted by line number.
*/
public allChangingObjects: ViewUnifiedChange[];
public allChangingObjects: ViewUnifiedChange[] = [];
/**
* preload the next motion for direct navigation
@ -451,7 +451,10 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
this.configService
.get<boolean>('motions_amendments_enabled')
.subscribe(enabled => (this.amendmentsEnabled = enabled));
this.configService.get<number>('motions_line_length').subscribe(lineLength => (this.lineLength = lineLength));
this.configService.get<number>('motions_line_length').subscribe(lineLength => {
this.lineLength = lineLength;
this.recalcUnifiedChanges();
});
this.configService
.get<LineNumberingMode>('motions_default_line_numbering')
.subscribe(mode => (this.lnMode = mode));
@ -524,6 +527,11 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
* be avoided. It's safer and simpler to return values than to manipulate the scope
*/
private recalcUnifiedChanges(): void {
if (!this.lineLength) {
// Happens if this function is called before the config variable has been loaded
return;
}
this.allChangingObjects = [];
if (this.changeRecommendations) {
this.changeRecommendations.forEach(
@ -936,7 +944,23 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
// setTimeout necessary for DOM-operations to work
window.setTimeout(() => {
const element = <HTMLElement>this.el.nativeElement;
const target = element.querySelector('.os-line-number.line-number-' + line.toString(10));
// We only scroll if it's not in the screen already
const bounding = element
.querySelector('.os-line-number.line-number-' + line.toString(10))
.getBoundingClientRect();
if (bounding.top >= 0 && bounding.bottom <= (window.innerHeight || document.documentElement.clientHeight)) {
return;
}
let target: Element;
// to make the selected line not stick at the very top of the screen, and to prevent it from being
// conceiled from the header, we actually scroll to a element a little bit above.
if (line > 4) {
target = element.querySelector('.os-line-number.line-number-' + (line - 4).toString(10));
} else {
target = element.querySelector('.title-line');
}
target.scrollIntoView({ behavior: 'smooth' });
}, 1);
}

1
client/src/app/slides/motions/motion/motion-slide.component.ts
View File

@ -60,7 +60,6 @@ export class MotionSlideComponent extends BaseMotionSlideComponent<MotionSlideDa
this.lineLength = value.data.line_length;
this.preamble = value.data.preamble;
this.crMode = value.element.mode || 'original';
console.log(this.crMode);
this.recalcUnifiedChanges();
}