Merge pull request #2964 from tsiegleauq/issue2962-pdf-for-diff

pdf w.o linen numbers and change rec. (fixes #2962)
This commit is contained in:
Norman Jäckel 2017-02-15 16:41:07 +01:00 committed by GitHub
commit d3ba49d040

View File

@ -257,18 +257,8 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
// motion text (with line-numbers)
var motionText = function() {
if ($scope.lineNumberMode == "inline" || $scope.lineNumberMode == "outside") {
/* in order to distinguish between the line-number-types we need to pass the scope
* to the convertHTML function.
* We should avoid this, since this completly breaks compatibilty for every
* other project that might want to use this HTML to PDF parser.
* https://github.com/OpenSlides/OpenSlides/issues/2361
*/
var text = motion.getTextByMode($scope.viewChangeRecommendations.mode, $scope.version);
return converter.convertHTML(text, $scope.lineNumberMode);
} else {
return converter.convertHTML(motion.getText($scope.version), $scope.lineNumberMode);
}
var motionTextContent = motion.getTextByMode($scope.viewChangeRecommendations.mode, $scope.version);
return converter.convertHTML(motionTextContent, $scope.lineNumberMode);
};
// motion reason heading