Revert "- fixes import with github, http,reslver-engine"

This reverts commit cf19a8bbac.
pull/1/head
yann300 5 years ago
parent cf19a8bbac
commit 071d7452bf
  1. 2
      src/app/files/file-explorer.js
  2. 28
      src/app/files/fileProvider.js
  3. 6
      src/app/ui/landing-page/landing-page.js

@ -350,7 +350,7 @@ fileExplorer.prototype.init = function () {
fileExplorer.prototype.publishToGist = function () {
modalDialogCustom.confirm(
'Create a public gist',
'Are you sure you want to publish all your files in browser directory anonymously as a public gist on github.com?',
'Are you sure you want to publish all your files anonymously as a public gist on github.com?',
() => { this.toGist() }
)
}

@ -6,11 +6,6 @@ class FileProvider {
constructor (name) {
this.event = new EventManager()
this.type = name
<<<<<<< HEAD
=======
this.normalizedNames = {} // contains the raw url associated with the displayed path
this.readonlyItems = ['browser']
>>>>>>> 2fe4db91... - fixes import with github, http,reslver-engine
}
exists (path, cb) {
@ -28,10 +23,6 @@ class FileProvider {
get (path, cb) {
cb = cb || function () {}
<<<<<<< HEAD
=======
if (this.normalizedNames[path]) path = this.normalizedNames[path] // ensure we actually use the normalized path from here
>>>>>>> 2fe4db91... - fixes import with github, http,reslver-engine
var unprefixedpath = this.removePrefix(path)
var exists = window.remixFileSystem.existsSync(unprefixedpath)
if (!exists) return cb(null, null)
@ -72,34 +63,15 @@ class FileProvider {
return true
}
<<<<<<< HEAD
addReadOnly (path, content) {
=======
addReadOnly (path, content, url) {
this.readonlyItems.push(path)
if (url !== undefined) this.normalizedNames[url] = path
>>>>>>> 2fe4db91... - fixes import with github, http,reslver-engine
return this.set(path, content)
}
isReadOnly (path) {
<<<<<<< HEAD
return false
}
remove (path) {
=======
return !this.readonlyItems.includes(path)
}
remove (path) {
// remove from readonly list
const indexToRemove = this.readonlyItems.indexOf(path)
if (indexToRemove !== -1) {
this.readonlyItems.splice(indexToRemove, 1)
}
>>>>>>> 2fe4db91... - fixes import with github, http,reslver-engine
var unprefixedpath = this.removePrefix(path)
if (!this._exists(unprefixedpath)) {
return false

@ -110,8 +110,10 @@ export class LandingPage extends ViewPlugin {
if (error) {
modalDialogCustom.alert(error)
} else {
fileProviders['browser'].addReadOnly(type + '/' + cleanUrl, content, url)
globalRegistry.get('verticalicon').api.select('fileExplorers')
if (fileProviders[type]) {
fileProviders[type].addReadOnly(cleanUrl, content, url)
globalRegistry.get('verticalicon').api.select('fileExplorers')
}
}
}
)

Loading…
Cancel
Save