conflictSearch is now aware of async nature of print()

Author: sashuk

browser/modules/print.js

@@ -192,15 +192,17 @@ module.exports = {
      *
      */
     print: (endEventName = "end:print", customData) => {
-        state.bookmarkState(customData).then(response => {
-            backboneEvents.get().trigger(endEventName, response);
-            callBack(response.responseJSON);
-        }).catch(response => {
-            backboneEvents.get().trigger(endEventName, response);
-            callBack(response.responseJSON);
+        return new Promise((resolve, reject) => {
+            state.bookmarkState(customData).then(response => {
+                backboneEvents.get().trigger(endEventName, response);
+                callBack(response.responseJSON);
+                resolve();
+            }).catch(response => {
+                backboneEvents.get().trigger(endEventName, response);
+                callBack(response.responseJSON);
+                reject();
+            });
         });
-
-        return true;
     },
 
     /**

extensions/conflictSearch/browser/controller.js

@@ -84,8 +84,9 @@ module.exports = {
             $("#conflict-get-print-fieldset").prop("disabled", true);
             $(this).button('loading');
             print.control(printC, scales, "_conflictPrint", "A4", "p", "inline");
-            print.print(endPrintEventName, conflictSearch.getResult());
-            print.cleanUp(true);
+            print.print(endPrintEventName, conflictSearch.getResult()).then(() => {
+                print.cleanUp(true);
+            });
         });
 
         // Click event for conflict search on/off toggle button