pull/5370/head
yann300 4 years ago
parent 498116ffd4
commit 0a78e0ae31
  1. 5
      apps/remix-ide/src/app.js
  2. 7
      apps/remix-ide/src/app/components/plugin-manager-component.js
  3. 8
      apps/remix-ide/src/remixEngine.js

@ -4,7 +4,6 @@ import { basicLogo } from './app/ui/svgLogo'
import { RunTab, makeUdapp } from './app/udapp'
import PanelsResize from './lib/panels-resize'
import { Engine } from '@remixproject/engine'
import { RemixEngine } from './remixEngine'
import { RemixAppManager } from './remixAppManager'
import { FramingService } from './framingService'
@ -234,7 +233,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
const workspace = pluginLoader.get()
const engine = new RemixEngine()
engine.register(appManager)
// SERVICES
// ----------------- import content servive ------------------------
const contentImport = new CompilerImport()
@ -403,7 +402,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
const params = queryParams.get()
// Set workspace after initial activation
if (Array.isArray(workspace)) {
if (Array.isArray(workspace)) {
appManager.activatePlugin(workspace).then(async () => {
try {
if (params.deactivate) {

@ -1,11 +1,10 @@
import { IframePlugin, ViewPlugin, WebsocketPlugin } from '@remixproject/engine-web'
import { PluginManagerSettings } from './plugin-manager-settings'
import * as packageJson from '../../../../../package.json'
const yo = require('yo-yo')
const csjs = require('csjs-inject')
const EventEmitter = require('events')
const LocalPlugin = require('./local-plugin')
import { IframePlugin, ViewPlugin, WebsocketPlugin } from '@remixproject/engine-web'
import { PluginManagerSettings } from './plugin-manager-settings'
import * as packageJson from '../../../../../package.json'
const addToolTip = require('../ui/tooltip')
const css = csjs`
@ -83,7 +82,7 @@ class PluginManagerComponent extends ViewPlugin {
this.localPlugin = new LocalPlugin()
this.filter = ''
this.appManager.event.on('activate', () => { this.reRender() })
this.appManager.event.on('deactivate', () => { this.reRender() })
this.appManager.event.on('deactivate', () => { this.reRender() })
this.engine = engine
this.engine.event.on('onRegistration', () => { this.reRender() })
}

@ -1,18 +1,16 @@
/* global localStorage, fetch */
import { Engine } from '@remixproject/engine'
import { EventEmitter } from 'events'
export class RemixEngine extends Engine {
constructor () {
super()
this.event = new EventEmitter()
}
setPluginOption ({ name, kind }) {
if (kind === 'provider') return {queueTimeout: 60000 * 2}
if (name === 'LearnEth') return {queueTimeout: 60000}
return {queueTimeout: 10000}
if (kind === 'provider') return { queueTimeout: 60000 * 2 }
if (name === 'LearnEth') return { queueTimeout: 60000 }
return { queueTimeout: 10000 }
}
onRegistration (plugin) {

Loading…
Cancel
Save