Skip to content

Commit

Permalink
removing preview JavaScript code after testing on Windows 10 #283 #285
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahus1
ahus1 committed Jun 27, 2019
1 parent 8e2b1ab commit d99990c
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 95 deletions.
128 changes: 63 additions & 65 deletions src/main/java/org/asciidoc/intellij/editor/javafx/JavaFxHtmlPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ protected String compute() {
return new StringBuilder()
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("scrollToElement.js")).append("\"></script>\n")
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("processLinks.js")).append("\"></script>\n")
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("processImages.js")).append("\"></script>\n")
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("pickSourceLine.js")).append("\"></script>\n")
.append("<script type=\"text/x-mathjax-config\">\n" +
"MathJax.Hub.Config({\n" +
Expand Down Expand Up @@ -138,6 +137,7 @@ protected String compute() {
private final Path imagesPath;

private VirtualFile parentDirectory;
private VirtualFile saveImageLastDir = null;

JavaFxHtmlPanel(Document document, Path imagesPath) {

Expand Down Expand Up @@ -203,6 +203,7 @@ public void run() {

updateFontSmoothingType(myWebView, false);
registerContextMenu(JavaFxHtmlPanel.this.myWebView);
myWebView.setContextMenuEnabled(false);
myWebView.setZoom(JBUI.scale(1.f));
myWebView.getEngine().loadContent(prepareHtml("<html><head></head><body>Initializing...</body>"));

Expand Down Expand Up @@ -251,9 +252,7 @@ private void registerContextMenu(WebView webView) {
JSObject object = getJavaScriptObjectAtLocation(webView, e);
if (object instanceof HTMLImageElement) {
String src = ((HTMLImageElement) object).getAttribute("src");
ApplicationManager.getApplication().invokeLater(() -> runFX(() -> {
bridge.saveImage(src);
}));
ApplicationManager.getApplication().invokeLater(() -> saveImage(src));
}
}
});
Expand All @@ -264,6 +263,66 @@ private JSObject getJavaScriptObjectAtLocation(WebView webView, MouseEvent e) {
return (JSObject) webView.getEngine().executeScript(script);
}

private void saveImage(@NotNull String path) {
String parent = imagesPath.getFileName().toString();
String subPath = path.substring(path.indexOf(parent) + parent.length() + 1);
Path imagePath = imagesPath.resolve(subPath);
if (imagePath.toFile().exists()) {
File file = imagePath.toFile();
String fileName = imagePath.getFileName().toString();
ArrayList<String> extensions = new ArrayList<>();
int lastDotIndex = fileName.lastIndexOf('.');
if (lastDotIndex > 0 && !fileName.endsWith(".")) {
extensions.add(fileName.substring(lastDotIndex + 1));
}
// set static file name if image name has been generated dynamically
final String fileNameNoExt;
if (fileName.matches("diag-[0-9a-f]{32}\\.[a-z]+")) {
fileNameNoExt = "image";
} else {
fileNameNoExt = lastDotIndex > 0 ? fileName.substring(0, lastDotIndex) : fileName;
}
// check if also a SVG exists for the provided PNG
if (extensions.contains("png") &&
new File(file.getParent(), fileNameNoExt + ".svg").exists()) {
extensions.add("svg");
}
final FileSaverDescriptor descriptor = new FileSaverDescriptor("Export Image to", "Choose the destination file",
extensions.toArray(new String[]{}));
FileSaverDialog saveFileDialog = FileChooserFactory.getInstance().createSaveFileDialog(descriptor, (Project) null);

VirtualFile baseDir = saveImageLastDir;

if (baseDir == null) {
baseDir = parentDirectory;
}

VirtualFile finalBaseDir = baseDir;

SwingUtilities.invokeLater(() -> {
VirtualFileWrapper destination = saveFileDialog.save(finalBaseDir, fileNameNoExt);
if (destination != null) {
try {
saveImageLastDir = LocalFileSystem.getInstance().findFileByIoFile(destination.getFile().getParentFile());
Path src = imagePath;
// if the destination ends with .svg, but the source doesn't, patch the source file name as the user chose a different file type
if (destination.getFile().getAbsolutePath().endsWith(".svg") && !src.endsWith(".svg")) {
src = new File(src.toFile().getAbsolutePath().replaceAll("\\.png$", ".svg")).toPath();
}
Files.copy(src, destination.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException ex) {
String message = "Can't save file: " + ex.getMessage();
Notification notification = AsciiDocPreviewEditor.NOTIFICATION_GROUP
.createNotification("Error in plugin", message, NotificationType.ERROR, null);
// increase event log counter
notification.setImportant(true);
Notifications.Bus.notify(notification);
}
}
});
}
}

private static void runFX(@NotNull Runnable r) {
IdeEventQueue.unsafeNonblockingExecute(r);
}
Expand Down Expand Up @@ -447,8 +506,6 @@ private static String getScriptingLines() {
@SuppressWarnings("unused")
public class JavaPanelBridge {

private VirtualFile lastDir = null;

public void openLink(@NotNull String link) {
final URI uri;
try {
Expand Down Expand Up @@ -532,65 +589,6 @@ public void scrollEditorToLine(int sourceLine) {
);
}

public void saveImage(@NotNull String path) {
String parent = imagesPath.getFileName().toString();
String subPath = path.substring(path.indexOf(parent) + parent.length() + 1);
Path imagePath = imagesPath.resolve(subPath);
if (imagePath.toFile().exists()) {
File file = imagePath.toFile();
String fileName = imagePath.getFileName().toString();
ArrayList<String> extensions = new ArrayList<>();
int lastDotIndex = fileName.lastIndexOf('.');
if (lastDotIndex > 0 && !fileName.endsWith(".")) {
extensions.add(fileName.substring(lastDotIndex + 1));
}
// set static file name if image name has been generated dynamically
final String fileNameNoExt;
if (fileName.matches("diag-[0-9a-f]{32}\\.[a-z]+")) {
fileNameNoExt = "image";
} else {
fileNameNoExt = lastDotIndex > 0 ? fileName.substring(0, lastDotIndex) : fileName;
}
// check if also a SVG exists for the provided PNG
if (extensions.contains("png") &&
new File(file.getParent(), fileNameNoExt + ".svg").exists()) {
extensions.add("svg");
}
final FileSaverDescriptor descriptor = new FileSaverDescriptor("Export Image to", "Choose the destination file",
extensions.toArray(new String[]{}));
FileSaverDialog saveFileDialog = FileChooserFactory.getInstance().createSaveFileDialog(descriptor, (Project) null);

VirtualFile baseDir = lastDir;

if (baseDir == null) {
baseDir = parentDirectory;
}

VirtualFile finalBaseDir = baseDir;

SwingUtilities.invokeLater(() -> {
VirtualFileWrapper destination = saveFileDialog.save(finalBaseDir, fileNameNoExt);
if (destination != null) {
try {
lastDir = LocalFileSystem.getInstance().findFileByIoFile(destination.getFile().getParentFile());
Path src = imagePath;
if (destination.getFile().getAbsolutePath().endsWith(".svg") && !src.endsWith(".svg")) {
src = new File(src.toFile().getAbsolutePath().replaceAll("\\.png$", ".svg")).toPath();
}
Files.copy(src, destination.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException ex) {
String message = "Can't save file: " + ex.getMessage();
Notification notification = AsciiDocPreviewEditor.NOTIFICATION_GROUP
.createNotification("Error in plugin", message, NotificationType.ERROR, null);
// increase event log counter
notification.setImportant(true);
Notifications.Bus.notify(notification);
}
}
});
}
}

public void log(@Nullable String text) {
Logger.getInstance(JavaPanelBridge.class).warn(text);
}
Expand Down
30 changes: 0 additions & 30 deletions src/main/resources/org/asciidoc/intellij/editor/javafx/processImages.js
View file

This file was deleted.

0 comments on commit d99990c

Please sign in to comment.