${fileExplorer.init()}
+
${configExplorer.init()}
${fileSystemExplorer.init()}
${swarmExplorer.init()}
${githubExplorer.init()}
@@ -106,6 +108,7 @@ function filepanel (appAPI, filesProvider) {
self.event = event
var element = template()
fileExplorer.ensureRoot()
+ configExplorer.ensureRoot()
var websocketconn = element.querySelector('.websocketconn')
filesProvider['localhost'].remixd.event.register('connecting', (event) => {
websocketconn.style.color = styles.colors.yellow
@@ -134,6 +137,10 @@ function filepanel (appAPI, filesProvider) {
appAPI.switchFile(path)
})
+ configExplorer.events.register('focus', function (path) {
+ appAPI.switchFile(path)
+ })
+
fileSystemExplorer.events.register('focus', function (path) {
appAPI.switchFile(path)
})
diff --git a/src/config.js b/src/config.js
index 49c349ec3f..5339159cbf 100644
--- a/src/config.js
+++ b/src/config.js
@@ -35,6 +35,7 @@ function Config (storage) {
this.ensureStorageUpdated = function (key) {
if (key === 'currentFile') {
if (this.items[key] && this.items[key] !== '' &&
+ this.items[key].indexOf('config/') !== 0 &&
this.items[key].indexOf('browser/') !== 0 &&
this.items[key].indexOf('localhost/') !== 0 &&
this.items[key].indexOf('swarm/') !== 0 &&
diff --git a/src/pluginManager.js b/src/pluginManager.js
index 2c8d4393dd..fd263b31d6 100644
--- a/src/pluginManager.js
+++ b/src/pluginManager.js
@@ -7,12 +7,35 @@
* - compilationData (that is triggered just after a focus - and send the current compilation data or null)
* - compilationFinished (that is only sent to the plugin that has focus)
*
- * @param {String} txHash - hash of the transaction
+ * Plugin can emit messages and receive response.
+ *
+ * CONFIG:
+ * - getConfig(filename). The data to send should be formatted like:
+ * {
+ * type: 'getConfig',
+ * arguments: ['filename.ext'],
+ * id:
+ * }
+ * the plugin will reveice a response like:
+ * {
+ * type: 'getConfig',
+ * id:
+ * error,
+ * result
+ * }
+ * same apply for the other call
+ * - setConfig(filename, content)
+ * - removeConfig
+ *
+ * See index.html and remix.js in test-browser folder for sample
+ *
*/
class PluginManager {
constructor (api, events) {
+ var self = this
this.plugins = {}
this.inFocus
+ var allowedapi = {'setConfig': 1, 'getConfig': 1, 'removeConfig': 1}
events.compiler.register('compilationFinished', (success, data, source) => {
if (this.inFocus) {
// trigger to the current focus
@@ -46,6 +69,27 @@ class PluginManager {
}))
}
})
+
+ window.addEventListener('message', (event) => {
+ function response (type, callid, error, result) {
+ self.post(self.inFocus, JSON.stringify({
+ id: callid,
+ type: type,
+ error: error,
+ result: result
+ }))
+ }
+ if (event.type === 'message' && this.inFocus && this.plugins[this.inFocus] && this.plugins[this.inFocus].origin === event.origin) {
+ var data = JSON.parse(event.data)
+ data.arguments.unshift(this.inFocus)
+ if (allowedapi[data.type]) {
+ data.arguments.push((error, result) => {
+ response(data.type, data.id, error, result)
+ })
+ api[data.type].apply({}, data.arguments)
+ }
+ }
+ }, false)
}
register (desc, content) {
this.plugins[desc.title] = {content, origin: desc.url}
diff --git a/test-browser/plugin/index.html b/test-browser/plugin/index.html
new file mode 100644
index 0000000000..2cb1662902
--- /dev/null
+++ b/test-browser/plugin/index.html
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PLUGIN
+
+
+ add config
+ remove config
+ get config
+
+
+
+
diff --git a/test-browser/plugin/remix.js b/test-browser/plugin/remix.js
new file mode 100644
index 0000000000..5449df96f1
--- /dev/null
+++ b/test-browser/plugin/remix.js
@@ -0,0 +1,32 @@
+
+function receiveMessage (event) {
+ console.log('receiveMessage', event.data, event.source, event.origin)
+ document.getElementById('compilationdata').innerHTML += event.data + '
'
+}
+window.addEventListener('message', receiveMessage, false)
+
+window.onload = function () {
+ document.querySelector('input#testmessageadd').addEventListener('click', function () {
+ window.parent.postMessage(JSON.stringify({
+ type: 'setConfig',
+ arguments: [document.getElementById('filename').value, document.getElementById('valuetosend').value],
+ id: 34
+ }), 'http://127.0.0.1:8080')
+ })
+
+ document.querySelector('input#testmessageremove').addEventListener('click', function () {
+ window.parent.postMessage(JSON.stringify({
+ type: 'removeConfig',
+ arguments: [document.getElementById('filename').value],
+ id: 35
+ }), 'http://127.0.0.1:8080')
+ })
+
+ document.querySelector('input#testmessagerget').addEventListener('click', function () {
+ window.parent.postMessage(JSON.stringify({
+ type: 'getConfig',
+ arguments: [document.getElementById('filename').value],
+ id: 36
+ }), 'http://127.0.0.1:8080')
+ })
+}
diff --git a/test-browser/tests/sharedFolderExplorer.js b/test-browser/tests/sharedFolderExplorer.js
index 9eb553dd1e..711359d59c 100644
--- a/test-browser/tests/sharedFolderExplorer.js
+++ b/test-browser/tests/sharedFolderExplorer.js
@@ -71,6 +71,7 @@ function runTests (browser, testData) {
.waitForElementVisible('[data-path="localhost/contract1.sol"]')
.assert.containsText('[data-path="localhost/contract1.sol"]', 'contract1.sol')
.assert.containsText('[data-path="localhost/contract2.sol"]', 'contract2.sol')
+ .waitForElementVisible('[data-path="localhost/folder1/contract1.sol"]')
.assert.containsText('[data-path="localhost/folder1/contract1.sol"]', 'contract1.sol')
.assert.containsText('[data-path="localhost/folder1/contract2.sol"]', 'contract2.sol') // load and test sub folder
.click('[data-path="localhost/folder1/contract2.sol"]')