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

Merge pull request #3657 from CatoTH/Issue3656-Too-Much-Caching-Line-Numbers

Browse Source 
Add firstLine to cache definition - fixes #3656
This commit is contained in:
Emanuel Schütze 2018-03-19 16:06:48 +01:00 committed by GitHub
commit 58dcb0c3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -44,7 +44,7 @@ Motions:
- Bugfix: Several bugfixes regarding splitting list items in - Bugfix: Several bugfixes regarding splitting list items in
change recommendations [#3288]. change recommendations [#3288].
- Bugfix: Several bugfixes regarding diff version [#3407, #3408, #3410, - Bugfix: Several bugfixes regarding diff version [#3407, #3408, #3410,
#3440, #3450, #3465, #3537, #3546, #3548, #3644]. #3440, #3450, #3465, #3537, #3546, #3548, #3644, #3656].
- Added inline Editing for motion reason [#3361]. - Added inline Editing for motion reason [#3361].
- Added multiselect filter for motion comments [#3372]. - Added multiselect filter for motion comments [#3372].
- Added support for pinning personal notes to the window [#3360]. - Added support for pinning personal notes to the window [#3360].

3
openslides/motions/static/js/motions/linenumbering.js
View File

@ -538,7 +538,8 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
newRoot = this.insertLineNumbersNode(html, lineLength, highlight, firstLine); newRoot = this.insertLineNumbersNode(html, lineLength, highlight, firstLine);
newHtml = newRoot.innerHTML; newHtml = newRoot.innerHTML;
} else { } else {
var cacheKey = this.djb2hash(lineLength.toString() + html); var firstLineStr = (firstLine === undefined || firstLine === null ? '' : firstLine.toString());
var cacheKey = this.djb2hash(firstLineStr + "-" + lineLength.toString() + html);
newHtml = lineNumberCache.get(cacheKey); newHtml = lineNumberCache.get(cacheKey);
if (angular.isUndefined(newHtml)) { if (angular.isUndefined(newHtml)) {