rdesktop2
filip mertens 1 year ago
parent 1d97df570c
commit 7f5f0bfd37
  1. 3
      libs/remix-solidity/package.json
  2. 3
      libs/remix-solidity/src/compiler/compiler-utils.ts
  3. 5084
      libs/remix-solidity/yarn.lock
  4. 1
      libs/remix-ui/search/src/lib/components/results/ResultItem.tsx

@ -24,6 +24,7 @@
"eslint-scope": "^5.0.0", "eslint-scope": "^5.0.0",
"ethers": "^5.4.2", "ethers": "^5.4.2",
"ethjs-util": "^0.1.6", "ethjs-util": "^0.1.6",
"is-electron": "^2.2.2",
"minixhr": "^3.2.2", "minixhr": "^3.2.2",
"semver": "^6.3.0", "semver": "^6.3.0",
"solc": "^0.7.4", "solc": "^0.7.4",
@ -58,4 +59,4 @@
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme", "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
"typings": "src/index.d.ts", "typings": "src/index.d.ts",
"gitHead": "18a9b1f4e6ec1fc94d2a81d0157d72b742daf620" "gitHead": "18a9b1f4e6ec1fc94d2a81d0157d72b742daf620"
} }

@ -1,4 +1,5 @@
import * as semver from 'semver' import * as semver from 'semver'
const isElectron = require('is-electron')
/* global Worker */ /* global Worker */
export const baseURLBin = 'https://binaries.soliditylang.org/bin' export const baseURLBin = 'https://binaries.soliditylang.org/bin'
@ -52,7 +53,7 @@ export function canUseWorker (selectedVersion) {
} }
function browserSupportWorker () { function browserSupportWorker () {
return true if(isElectron()) return true
return document ? document.location.protocol !== 'file:' && Worker !== undefined : false return document ? document.location.protocol !== 'file:' && Worker !== undefined : false
} }

File diff suppressed because it is too large Load Diff

@ -79,7 +79,6 @@ export const ResultItem = (props: ResultItemProps) => {
const doLoad = () => { const doLoad = () => {
if(!subscribed.current) return if(!subscribed.current) return
console.log('DO LOAD')
findText(props.file.filename).then(res => { findText(props.file.filename).then(res => {
if (subscribed.current) { if (subscribed.current) {
setLines(res) setLines(res)

Loading…
Cancel
Save