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

Merge pull request #2446 from tsiegleauq/issue2441-LineNumberBlankText

Browse Source 
PDF line numbers for new linenumbering.js (fixes #2441)
This commit is contained in:
Norman Jäckel 2016-09-30 17:35:53 +02:00 committed by GitHub
commit 188f605973
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,9 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
service = this; service = this;
var addLine = function (text, highlight) { var addLine = function (text, highlight) {
var node; var node;
if (typeof highlight === 'undefined') {
highlight = 0;
}
if (firstTextNode) { if (firstTextNode) {
if (highlight == service._currentLineNumber - 1) { if (highlight == service._currentLineNumber - 1) {
node = document.createElement('span'); node = document.createElement('span');

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

@ -21,7 +21,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
* other project that might want to use this HTML to PDF parser. * other project that might want to use this HTML to PDF parser.
* https://github.com/OpenSlides/OpenSlides/issues/2361 * https://github.com/OpenSlides/OpenSlides/issues/2361
*/ */
return converter.convertHTML($scope.lineBrokenText, $scope); return converter.convertHTML(motion.getTextWithLineBreaks($scope.version), $scope);
} else { } else {
return converter.convertHTML(motion.getText($scope.version), $scope); return converter.convertHTML(motion.getText($scope.version), $scope);
} }