Browse Source

Merge pull request #805 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit 'cb87c7eb8bdcdce29eff81ee4ffc1566d9a940ee':
  KERNEL-445 防止没有添加jXBrowser的用户启动失败
bugfix/10.0
richie 6 years ago
parent
commit
6bf9fb8b5d
  1. 17
      designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java

17
designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java

@ -11,9 +11,6 @@ import com.fr.web.struct.Atom;
import com.fr.web.struct.browser.RequestClient; import com.fr.web.struct.browser.RequestClient;
import com.fr.web.struct.category.ScriptPath; import com.fr.web.struct.category.ScriptPath;
import com.fr.web.struct.impl.FineUI; import com.fr.web.struct.impl.FineUI;
import com.teamdev.jxbrowser.chromium.JSValue;
import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -31,13 +28,13 @@ public class FineUIAction extends UpdateAction {
@Override @Override
public void actionPerformed(final ActionEvent e) { public void actionPerformed(final ActionEvent e) {
ModernUIPane<?> pane = new ModernUIPane.Builder<>() ModernUIPane<?> pane = new ModernUIPane.Builder<>()
.prepare(new ScriptContextAdapter() { // .prepare(new ScriptContextAdapter() {
@Override // @Override
public void onScriptContextCreated(ScriptContextEvent event) { // public void onScriptContextCreated(ScriptContextEvent event) {
JSValue pool = event.getBrowser().executeJavaScriptAndReturnValue("window.Pool"); // JSValue pool = event.getBrowser().executeJavaScriptAndReturnValue("window.Pool");
pool.asObject().setProperty("i18n", new I18n()); // pool.asObject().setProperty("i18n", new I18n());
} // }
}) // })
.withComponent(new AssembleComponent() { .withComponent(new AssembleComponent() {
@Override @Override

Loading…
Cancel
Save