From 233ea36ef8b6fbd0c5c3f2d7b686a650fd77dfdb Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 7 Nov 2018 16:59:08 +0100
Subject: [PATCH] =?UTF-8?q?fix=20probl=C3=A8mes=20boutons=20blockage=20zon?=
=?UTF-8?q?e=20impression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/module_vmap/module/javascript/app/vmap/tools/print.js | 8 +++-----
src/module_vmap/module/template/tools/print.html | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/module_vmap/module/javascript/app/vmap/tools/print.js b/src/module_vmap/module/javascript/app/vmap/tools/print.js
index c0c82271..f7f2d63d 100644
--- a/src/module_vmap/module/javascript/app/vmap/tools/print.js
+++ b/src/module_vmap/module/javascript/app/vmap/tools/print.js
@@ -497,9 +497,8 @@ nsVmap.nsToolsManager.Print.prototype.printController.prototype.changeScale = fu
nsVmap.nsToolsManager.Print.prototype.printController.prototype.managePrintZone = function () {
oVmap.log('nsVmap.nsToolsManager.Print.prototype.printController.prototype.managePrintZone');
- if (this['currentAction'] === 'print-modifyPrintZone' && this.$scope_["managePrintZoneInProgress"]) {
- this.printBox_.unmanagePrintBoxAndLock();
- this.printBox_.unlistenMapMovements();
+ if (this['currentAction'] === 'print-modifyPrintZone' && this.$scope_['managePrintZoneInProgress']) {
+ this.printBox_.unmanagePrintBox();
this.$scope_["managePrintZoneInProgress"] = false;
} else {
this.$scope_["managePrintZoneInProgress"] = true;
@@ -515,8 +514,7 @@ nsVmap.nsToolsManager.Print.prototype.printController.prototype.manageComparePri
oVmap.log('nsVmap.nsToolsManager.Print.prototype.printController.prototype.manageComparePrintZone');
if (this['currentAction'] === 'print-modifyPrintZone' && this.$scope_["manageComparePrintZoneInProgress"]) {
- this.printBoxCompare_.unmanagePrintBoxAndLock();
- this.printBoxCompare_.unlistenMapMovements();
+ this.printBoxCompare_.unmanagePrintBox();
this.$scope_["manageComparePrintZoneInProgress"] = false;
} else {
//this.printBox_.unmanagePrintBox();
diff --git a/src/module_vmap/module/template/tools/print.html b/src/module_vmap/module/template/tools/print.html
index aa75c7eb..330a8b9c 100644
--- a/src/module_vmap/module/template/tools/print.html
+++ b/src/module_vmap/module/template/tools/print.html
@@ -56,14 +56,14 @@
title="Modification de la zone d'impression sur la carte"
class="btn btn-info btn-sm"
style="margin-top: 10px"
- ng-class="{'active': managePrintZoneInProgress, 'disabled': manageComparePrintZoneInProgress}"
+ ng-class="{'active': managePrintZoneInProgress}"
ng-click="ctrl.managePrintZone()"><span class="glyphicon glyphicon-move"></span></button>
<button type="button"
title="Modification de la zone d'impression sur la carte de comparaison"
ng-show="$root.compare_enabled"
class="btn btn-info btn-sm"
style="margin-top: 10px"
- ng-class="{'active': manageComparePrintZoneInProgress, 'disabled': managePrintZoneInProgress}"
+ ng-class="{'active': manageComparePrintZoneInProgress}"
ng-click="ctrl.manageComparePrintZone()"><span class="glyphicon glyphicon-move"></span></button>
<button type="submit"
--
GitLab