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

Merge pull request #2649 from CatoTH/bugfix-disabling-inline-editing

Browse Source 
Bugfix disabling inline editing
This commit is contained in:
Emanuel Schütze 2016-11-23 22:03:31 +01:00 committed by GitHub
commit 14d00cc404
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openslides/motions/static/js/motions/motion-services.js
View File

@ -315,6 +315,17 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
$content.on("mouseover", ".line-numbers-outside .os-line-number.selectable", obj.mouseOver); $content.on("mouseover", ".line-numbers-outside .os-line-number.selectable", obj.mouseOver);
$content.on("mouseover", ".motion-text-original", obj.startCreating); $content.on("mouseover", ".motion-text-original", obj.startCreating);
$scope.$watch(function () {
return $scope.change_recommendations.length;
}, function () {
if (obj.mode == MODE_INACTIVE || obj.mode == MODE_SELECTING_FROM) {
// Recalculate the affected lines so we cannot select lines affected by a recommendation
// that has just been created
$(".motion-text-original .os-line-number").removeClass("selected selectable");
obj.startCreating();
}
});
$scope.$on("$destroy", function () { $scope.$on("$destroy", function () {
obj.destroy(); obj.destroy();
}); });

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

@ -1093,7 +1093,7 @@ angular.module('OpenSlidesApp.motions.site', [
// open edit dialog // open edit dialog
$scope.openDialog = function (motion) { $scope.openDialog = function (motion) {
if ($scope.inlineEditing.active) { if ($scope.inlineEditing.active) {
$scope.disableInlineEditing(); $scope.inlineEditing.disable();
} }
ngDialog.open(MotionForm.getDialog(motion)); ngDialog.open(MotionForm.getDialog(motion));
}; };