Merge branch 'develop' into Release_2_9_0b1_Branch

[jalview.git] / src / jalview / io / BioJsHTMLOutput.java

diff --git a/src/jalview/io/BioJsHTMLOutput.java b/src/jalview/io/BioJsHTMLOutput.java
index 0d4dc87..5e2cba6 100644 (file)
--- a/src/jalview/io/BioJsHTMLOutput.java
+++ b/src/jalview/io/BioJsHTMLOutput.java
@@ -115,11 +115,7 @@ public class BioJsHTMLOutput
       AlignmentExportData exportData = jalview.gui.AlignFrame
               .getAlignmentForExport(JSONFile.FILE_DESC,
                       ap.getAlignViewport(), exportSettings);
-      if (exportData.getSettings().isCancelled())
-      {
-        return;
-      }
-      String jalviewAlignmentJson = new FormatAdapter(ap,
+      String bioJSON = new FormatAdapter(ap,
               exportData.getSettings()).formatSequences(JSONFile.FILE_DESC,
               exportData.getAlignment(), exportData.getOmitHidden(),
               exportData.getStartEndPostions(), ap.getAlignViewport()
@@ -127,7 +123,7 @@ public class BioJsHTMLOutput
 
       String bioJSTemplateString = getBioJsTemplateAsString();
       String generatedBioJsWithJalviewAlignmentAsJson = bioJSTemplateString
-              .replaceAll("#sequenceData#", jalviewAlignmentJson)
+              .replaceAll("#sequenceData#", bioJSON)
               .toString();
 
       PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(