Merge pull request #1046 from ethereum/removeLoadFilesFromParent

remove load files from parent
pull/1045/head^2
David Disu 4 years ago committed by GitHub
commit 746dd7db94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      apps/remix-ide/src/app.js
  2. 22
      apps/remix-ide/src/loadFilesFromParent.js

@ -25,7 +25,6 @@ const csjs = require('csjs-inject')
const yo = require('yo-yo')
const remixLib = require('@remix-project/remix-lib')
const registry = require('./global/registry')
const loadFileFromParent = require('./loadFilesFromParent')
const { OffsetToLineColumnConverter } = require('./lib/offsetToLineColumnConverter')
const QueryParams = require('./lib/query-params')
const Storage = remixLib.Storage
@ -491,8 +490,5 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
const framingService = new FramingService(sidePanel, menuicons, mainview, this._components.resizeFeature)
framingService.start(params)
// get the file list from the parent iframe
loadFileFromParent(fileManager)
if (params.embed) framingService.embed()
}

@ -1,22 +0,0 @@
module.exports = (fileManager) => {
// The event listener needs to be registered as early as possible, because the
// parent will send the message upon the "load" event.
let filesToLoad = null
let loadFilesCallback = function (files) { filesToLoad = files } // will be replaced later
window.addEventListener('message', function (ev) {
if (typeof ev.data === typeof [] && ev.data[0] === 'loadFiles') {
loadFilesCallback(ev.data[1])
}
}, false)
// Replace early callback with instant response
loadFilesCallback = function (files) {
fileManager.setBatchFiles(files)
}
// Run if we did receive an event from remote instance while starting up
if (filesToLoad !== null) {
fileManager.setBatchFiles(filesToLoad)
}
}
Loading…
Cancel
Save