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

Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching

Browse Source 
Bugfix: changing line length did not invalidate cache
This commit is contained in:
Emanuel Schütze 2017-04-19 15:03:48 +02:00 committed by GitHub
commit 8c4ec1c218
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -18,6 +18,7 @@ Motions:
- Removed server side image to base64 transformation and - Removed server side image to base64 transformation and
added local transformation [#2705] added local transformation [#2705]
- Added support for export motions in a zip archive [#3189]. - Added support for export motions in a zip archive [#3189].
- Bugfix: changing motion line length did not invalidate cache [#3202]
Core: Core:
- No reload on logoff. OpenSlides is now a full single page - No reload on logoff. OpenSlides is now a full single page

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

@ -475,7 +475,7 @@ 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(html); var cacheKey = this.djb2hash(lineLength.toString() + html);
newHtml = lineNumberCache.get(cacheKey); newHtml = lineNumberCache.get(cacheKey);
if (angular.isUndefined(newHtml)) { if (angular.isUndefined(newHtml)) {

9
tests/karma/motions/linenumbering.service.test.js
View File

@ -389,4 +389,13 @@ describe('linenumbering', function () {
expect(highlighted).toBe(noMarkup(1) + '<span>Lorem ' + brMarkup(2) + 'ipsum ' + brMarkup(3) + 'dolor' + brMarkup(4) + 'sit ' + brMarkup(5) + 'amet</span>'); expect(highlighted).toBe(noMarkup(1) + '<span>Lorem ' + brMarkup(2) + 'ipsum ' + brMarkup(3) + 'dolor' + brMarkup(4) + 'sit ' + brMarkup(5) + 'amet</span>');
}); });
}); });
describe('caching', function() {
it('caches based on line length', function () {
var inHtml = '<p>' +longstr(100) + '</p>';
var outHtml80 = lineNumberingService.insertLineNumbers(inHtml, 80);
var outHtml70 = lineNumberingService.insertLineNumbers(inHtml, 70);
expect(outHtml70).not.toBe(outHtml80);
});
});
}); });