diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..64e0708 --- /dev/null +++ b/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'java' + id 'org.jetbrains.intellij' version '0.4.8' +} + +group 'gfm-plugin' +version '0.2.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() + flatDir { + dirs 'lib' + } +} + +dependencies { + compile(name: 'jfxrt') + compile(name: 'Loboevolution') + compile(name: 'jxbrowser/jxbrowser-6.23.1') + compile(name: 'jxbrowser/jxbrowser-linux64-6.23.1') + compile(name: 'jxbrowser/jxbrowser-mac-6.23.1') + compile(name: 'jxbrowser/jxbrowser-win32-6.23.1') + compile(name: 'jxbrowser/jxbrowser-win64-6.23.1') + compile(name: 'jxbrowser/licence') + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +intellij { + version '2016.2' +} \ No newline at end of file diff --git a/gfm-plugin.iml b/gfm-plugin.iml deleted file mode 100644 index 2e85b56..0000000 --- a/gfm-plugin.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29e08e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..28861d2 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..115e6ac --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/jxbrowser/development.jar b/lib/jxbrowser/development.jar deleted file mode 100755 index af75880..0000000 Binary files a/lib/jxbrowser/development.jar and /dev/null differ diff --git a/lib/jxbrowser/jxbrowser-5.4.3.jar b/lib/jxbrowser/jxbrowser-5.4.3.jar deleted file mode 100644 index e139c10..0000000 Binary files a/lib/jxbrowser/jxbrowser-5.4.3.jar and /dev/null differ diff --git a/lib/jxbrowser/jxbrowser-6.23.1.jar b/lib/jxbrowser/jxbrowser-6.23.1.jar new file mode 100644 index 0000000..ff9b2bc Binary files /dev/null and b/lib/jxbrowser/jxbrowser-6.23.1.jar differ diff --git a/lib/jxbrowser/jxbrowser-mac-5.4.3.jar b/lib/jxbrowser/jxbrowser-linux64-6.23.1.jar similarity index 78% rename from lib/jxbrowser/jxbrowser-mac-5.4.3.jar rename to lib/jxbrowser/jxbrowser-linux64-6.23.1.jar index dd02f5c..24c9eee 100644 Binary files a/lib/jxbrowser/jxbrowser-mac-5.4.3.jar and b/lib/jxbrowser/jxbrowser-linux64-6.23.1.jar differ diff --git a/lib/jxbrowser/jxbrowser-linux64-5.4.3.jar b/lib/jxbrowser/jxbrowser-mac-6.23.1.jar similarity index 74% rename from lib/jxbrowser/jxbrowser-linux64-5.4.3.jar rename to lib/jxbrowser/jxbrowser-mac-6.23.1.jar index a3aa3c6..3cbb38f 100644 Binary files a/lib/jxbrowser/jxbrowser-linux64-5.4.3.jar and b/lib/jxbrowser/jxbrowser-mac-6.23.1.jar differ diff --git a/lib/jxbrowser/jxbrowser-win-5.4.3.jar b/lib/jxbrowser/jxbrowser-win32-6.23.1.jar similarity index 78% rename from lib/jxbrowser/jxbrowser-win-5.4.3.jar rename to lib/jxbrowser/jxbrowser-win32-6.23.1.jar index 18827be..4aa1342 100644 Binary files a/lib/jxbrowser/jxbrowser-win-5.4.3.jar and b/lib/jxbrowser/jxbrowser-win32-6.23.1.jar differ diff --git a/lib/jxbrowser/jxbrowser-linux32-5.4.3.jar b/lib/jxbrowser/jxbrowser-win64-6.23.1.jar similarity index 59% rename from lib/jxbrowser/jxbrowser-linux32-5.4.3.jar rename to lib/jxbrowser/jxbrowser-win64-6.23.1.jar index ebc7038..77a68b4 100644 Binary files a/lib/jxbrowser/jxbrowser-linux32-5.4.3.jar and b/lib/jxbrowser/jxbrowser-win64-6.23.1.jar differ diff --git a/lib/jxbrowser/licence.jar b/lib/jxbrowser/licence.jar new file mode 100644 index 0000000..6bcd1b4 Binary files /dev/null and b/lib/jxbrowser/licence.jar differ diff --git a/lib/jxbrowser/runtime.jar b/lib/jxbrowser/runtime.jar deleted file mode 100755 index 7862d98..0000000 Binary files a/lib/jxbrowser/runtime.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..791b128 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'gfm-plugin' + diff --git a/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java b/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java index 6e01f79..342ea45 100644 --- a/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java +++ b/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java @@ -73,13 +73,13 @@ public void run() { public void executeJavaScriptAndReturnValue(String script, JsExecutedListener jsExecutedListener) { JSValue jsValue = webView.getBrowser().executeJavaScriptAndReturnValue(script); if (jsValue.isBoolean()) { - jsExecutedListener.onJsExecuted(Boolean.toString(jsValue.getBoolean())); + jsExecutedListener.onJsExecuted(Boolean.toString(jsValue.getBooleanValue())); } if (jsValue.isFunction()) { - jsExecutedListener.onJsExecuted(jsValue.getString()); + jsExecutedListener.onJsExecuted(jsValue.getStringValue()); } if (jsValue.isNumber()) { - jsExecutedListener.onJsExecuted(Double.toString(jsValue.getNumber())); + jsExecutedListener.onJsExecuted(Double.toString(jsValue.getNumberValue())); } jsExecutedListener.onJsExecuted(jsValue.toString()); } diff --git a/src/main/java/com/github/shyykoserhiy/gfm/editor/GfmPreviewJX.java b/src/main/java/com/github/shyykoserhiy/gfm/editor/GfmPreviewJX.java index 93f3140..88f5573 100644 --- a/src/main/java/com/github/shyykoserhiy/gfm/editor/GfmPreviewJX.java +++ b/src/main/java/com/github/shyykoserhiy/gfm/editor/GfmPreviewJX.java @@ -6,8 +6,10 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.vfs.VirtualFile; import com.teamdev.jxbrowser.chromium.Browser; -import com.teamdev.jxbrowser.chromium.BrowserFunction; +import com.teamdev.jxbrowser.chromium.JSFunctionCallback; import com.teamdev.jxbrowser.chromium.JSValue; +import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter; +import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -42,16 +44,16 @@ protected GfmRequestDoneListener getRequestDoneListener() { private class RequestDoneListener implements GfmRequestDoneListener { @Override public void onRequestDone(final File result) { - ((BrowserJx) GfmPreviewJX.this.browser).getWebView().getBrowser().registerFunction("getMarkdown", new BrowserFunction() { - public JSValue invoke(JSValue... args) { - return JSValue.create(markdown); - } - }); - ((BrowserJx) GfmPreviewJX.this.browser).getWebView().getBrowser().registerFunction("getTitle", new BrowserFunction() { - public JSValue invoke(JSValue... args) { - return JSValue.create(title); + ((BrowserJx) GfmPreviewJX.this.browser).getWebView().getBrowser().addScriptContextListener(new ScriptContextAdapter() { + @Override + public void onScriptContextCreated(ScriptContextEvent event) { + Browser browser = event.getBrowser(); + JSValue window = browser.executeJavaScriptAndReturnValue("window"); + window.asObject().setProperty("getMarkdown", (JSFunctionCallback) args -> markdown); + window.asObject().setProperty("getTitle", (JSFunctionCallback) args -> title); } }); + browser.loadUrl("file:" + result.getAbsolutePath()); onceUpdated = true; } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index d28c0e9..21cb9bd 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ - + com.github.shyykoserhiy.gfm gfm - 0.1.14 + 0.2.0 Shyyko Serhiy + 0.2.0 + 0.1.14