Commit df2263d6 authored by Armand Bahi's avatar Armand Bahi

Merge branch 'master' into pre-2018.04.02

parents 288e62c8 92721a9e
......@@ -493,6 +493,10 @@ nsVmap.nsToolsManager.Print.prototype.printController.prototype.getPrintedMapSiz
mapHeight = tmpHeight / resizeCoeff;
}
setTimeout(function () {
$(template).remove();
});
return {
printedMapSize: [mapWidth, mapHeight],
realSize: [imageDiv.width(), imageDiv.height()],
......@@ -721,9 +725,7 @@ nsVmap.nsToolsManager.Print.prototype.printController.prototype.print = function
var sOrientation = response['data']['data'][0]['rt_orientation_id'];
// Cas d'utilisation de la fonction print sans passer par le forumlaire
if (opt_options.recalcSize === true ||
!goog.isDefAndNotNull(this.printedMapSize_) ||
!goog.isDefAndNotNull(this_.printedOverviewMapSize_)) {
if (opt_options.recalcSize === true) {
this_.setTemplate({
'definition': response['data']['data'][0]['definition']
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment