Commit 071d7452 authored by yann300's avatar yann300

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

This reverts commit cf19a8bb.
parent cf19a8bb
...@@ -350,7 +350,7 @@ fileExplorer.prototype.init = function () { ...@@ -350,7 +350,7 @@ fileExplorer.prototype.init = function () {
fileExplorer.prototype.publishToGist = function () { fileExplorer.prototype.publishToGist = function () {
modalDialogCustom.confirm( modalDialogCustom.confirm(
'Create a public gist', '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() } () => { this.toGist() }
) )
} }
......
...@@ -6,11 +6,6 @@ class FileProvider { ...@@ -6,11 +6,6 @@ class FileProvider {
constructor (name) { constructor (name) {
this.event = new EventManager() this.event = new EventManager()
this.type = name 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) { exists (path, cb) {
...@@ -28,10 +23,6 @@ class FileProvider { ...@@ -28,10 +23,6 @@ class FileProvider {
get (path, cb) { get (path, cb) {
cb = cb || function () {} 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 unprefixedpath = this.removePrefix(path)
var exists = window.remixFileSystem.existsSync(unprefixedpath) var exists = window.remixFileSystem.existsSync(unprefixedpath)
if (!exists) return cb(null, null) if (!exists) return cb(null, null)
...@@ -72,34 +63,15 @@ class FileProvider { ...@@ -72,34 +63,15 @@ class FileProvider {
return true return true
} }
<<<<<<< HEAD
addReadOnly (path, content) { 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) return this.set(path, content)
} }
isReadOnly (path) { isReadOnly (path) {
<<<<<<< HEAD
return false return false
} }
remove (path) { 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) var unprefixedpath = this.removePrefix(path)
if (!this._exists(unprefixedpath)) { if (!this._exists(unprefixedpath)) {
return false return false
......
...@@ -110,10 +110,12 @@ export class LandingPage extends ViewPlugin { ...@@ -110,10 +110,12 @@ export class LandingPage extends ViewPlugin {
if (error) { if (error) {
modalDialogCustom.alert(error) modalDialogCustom.alert(error)
} else { } else {
fileProviders['browser'].addReadOnly(type + '/' + cleanUrl, content, url) if (fileProviders[type]) {
fileProviders[type].addReadOnly(cleanUrl, content, url)
globalRegistry.get('verticalicon').api.select('fileExplorers') globalRegistry.get('verticalicon').api.select('fileExplorers')
} }
} }
}
) )
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment