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 c0c822710248e4f8b83269d56e163f6e471c9043..f7f2d63ddf1ee33e3a17f4b243bace8d9cadc869 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 aa75c7eb76de4c00e6605cdb0445fb390ca7bd80..330a8b9c2733511e33358d8d02c6e41a6463122a 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"