Skip to content

Commit f288db9

Browse files
committed
Merge remote-tracking branch 'origin/fix/printclient-repeat-lookups' into release/1.1
2 parents 39768e4 + 8f843a6 commit f288db9

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Resources/public/mapbender.element.digitizer.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
}
191191

192192
},
193+
printClient: null,
193194

194195
/**
195196
* Constructor.
@@ -206,6 +207,12 @@
206207
}
207208
var element = widget.element;
208209
widget.elementUrl = Mapbender.configuration.application.urls.element + '/' + element.attr('id') + '/';
210+
var self = this;
211+
Mapbender.elementRegistry.waitReady('.mb-element-printclient').then(function(printClient) {
212+
self.printClient = printClient;
213+
}, function() {
214+
self.printClient = false;
215+
});
209216
Mapbender.elementRegistry.onElementReady(widget.options.target, $.proxy(widget._setup, widget));
210217
},
211218

@@ -889,18 +896,14 @@
889896
widget.currentPopup.popupDialog('close');
890897
}
891898

892-
if(schema.printable) {
899+
if (schema.printable && this.printClient) {
900+
var printClient = this.printClient;
893901
var printButton = {
894902
text: translate("feature.print"),
895903
click: function() {
896-
var printWidget = $('.mb-element-printclient').data('mapbenderMbPrintClient');
897-
if(printWidget) {
898-
var dialog = $(this).closest(".ui-dialog-content");
899-
var olFeature = dialog.data('feature');
900-
printWidget.printDigitizerFeature(olFeature, olFeature.schema.featureTypeName || olFeature.schema.schemaName);
901-
} else {
902-
$.notify("Druck element ist nicht verfügbar!");
903-
}
904+
var dialog = $(this).closest(".ui-dialog-content");
905+
var olFeature = dialog.data('feature');
906+
printClient.printDigitizerFeature(olFeature, olFeature.schema.featureTypeName || olFeature.schema.schemaName);
904907
}
905908
};
906909
buttons.push(printButton);

0 commit comments

Comments
 (0)