Merge pull request #3386 from emanuelschuetze/fixReasonInlineEditing

Fixed inline editing of motion reason.
This commit is contained in:
Norman Jäckel 2017-09-01 20:41:09 +02:00 committed by GitHub
commit 438318d3d0

View File

@ -1501,14 +1501,13 @@ angular.module('OpenSlidesApp.motions.site', [
return motion.getTextWithLineBreaks($scope.version); return motion.getTextWithLineBreaks($scope.version);
}, },
function (obj) { function (obj) {
motion.reason = motion.getReason(-1);
motion.setTextStrippingLineBreaks(obj.editor.getData()); motion.setTextStrippingLineBreaks(obj.editor.getData());
motion.disable_versioning = (obj.trivialChange && motion.disable_versioning = (obj.trivialChange &&
Config.get('motions_allow_disable_versioning').value); Config.get('motions_allow_disable_versioning').value);
} }
); );
$scope.reasonInlineEditing = MotionInlineEditing.createInstance($scope, motion, $scope.reasonInlineEditing = MotionInlineEditing.createInstance($scope, motion,
'reason-inline-editor', true, 'reason-inline-editor', true, Editor.getOptions('inline'),
function (obj) { function (obj) {
return motion.getReason($scope.version); return motion.getReason($scope.version);
}, },