MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Correct JBCefUtils.addJSHandler param

Browse Source 
GitOrigin-RevId: 25f2890b3354ed4c492758045d6c84e07b37e157
This commit is contained in:
Anton Tarasov
2019-12-03 19:37:06 +00:00
committed by intellij-monorepo-bot
parent 1de02e6193
commit 4de9ce0393
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/jcef/JBCefUtils.java
+4 -5
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ui.jcef;
import org.cef.CefClient;
import org.cef.browser.CefBrowser;
import org.cef.browser.CefFrame;
import org.cef.browser.CefMessageRouter;
@@ -22,7 +21,7 @@ import java.util.function.Function;
public class JBCefUtils {
private static final Map<String, CefMessageRouter> id2msgRouter = new HashMap<>();
public static void addJSHandler(@NotNull CefClient cefClient, @NotNull String jsRequestID, @NotNull Function<String, Boolean> handler) {
public static void addJSHandler(@NotNull JBCefClient cefClient, @NotNull String jsRequestID, @NotNull Function<String, Boolean> handler) {
CefMessageRouter.CefMessageRouterConfig config = new CefMessageRouter.CefMessageRouterConfig();
config.jsQueryFunction = jsRequestID;
config.jsCancelFunction = jsRequestID;
@@ -39,14 +38,14 @@ public class JBCefUtils {
return handler.apply(request);
}
}, true);
cefClient.addMessageRouter(msgRouter);
cefClient.getCefClient().addMessageRouter(msgRouter);
id2msgRouter.put(jsRequestID, msgRouter);
}
public static void removeJSHandler(@NotNull CefClient cefClient, @NotNull String jsRequestID) {
public static void removeJSHandler(@NotNull JBCefClient cefClient, @NotNull String jsRequestID) {
CefMessageRouter r = id2msgRouter.get(jsRequestID);
if (r != null) {
cefClient.removeMessageRouter(r);
cefClient.getCefClient().removeMessageRouter(r);
id2msgRouter.remove(jsRequestID);
}
}
plugins/markdown/src/org/intellij/plugins/markdown/ui/preview/jcef/MarkdownJCEFHtmlPanel.java
+4 -4
View File
@@ -49,7 +49,7 @@ public class MarkdownJCEFHtmlPanel extends JCEFHtmlPanel implements MarkdownHtml
public MarkdownJCEFHtmlPanel() {
super();
JBCefUtils.addJSHandler(getCefBrowser().getClient(), JS_REQ_SET_SCROLL_Y,
JBCefUtils.addJSHandler(getJBCefClient(), JS_REQ_SET_SCROLL_Y,
(value) -> {
try {
myScrollPreservingListener.myScrollY = Integer.parseInt(value);
@@ -58,7 +58,7 @@ public class MarkdownJCEFHtmlPanel extends JCEFHtmlPanel implements MarkdownHtml
});
if (Registry.is("markdown.open.link.in.external.browser")) {
JBCefUtils.addJSHandler(getCefBrowser().getClient(), JS_REQ_OPEN_IN_BROWSER,
JBCefUtils.addJSHandler(getJBCefClient(), JS_REQ_OPEN_IN_BROWSER,
(link) -> {
MarkdownAccessor.getSafeOpenerAccessor().openLink(link);
return true;
@@ -124,8 +124,8 @@ public class MarkdownJCEFHtmlPanel extends JCEFHtmlPanel implements MarkdownHtml
public void dispose() {
super.dispose();
getJBCefClient().removeLoadHandler(myCefLoadHandler, getCefBrowser());
JBCefUtils.removeJSHandler(getCefBrowser().getClient(), JS_REQ_SET_SCROLL_Y);
JBCefUtils.removeJSHandler(getCefBrowser().getClient(), JS_REQ_OPEN_IN_BROWSER);
JBCefUtils.removeJSHandler(getJBCefClient(), JS_REQ_SET_SCROLL_Y);
JBCefUtils.removeJSHandler(getJBCefClient(), JS_REQ_OPEN_IN_BROWSER);
}
@NotNull