refactor this2self + adapt passing of compiler

umar121 · Apr 15, 2018 · 078faca · 078faca
1 parent 4080565
commit 078faca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/app/plugin/pluginManager.js b/src/app/plugin/pluginManager.js
@@ -38,13 +38,14 @@
  *
  */
 module.exports = class PluginManager {
-  constructor  (api = {}, events = {}, opts = {}) {
+  constructor (api = {}, events = {}, opts = {}) {
     const self = this
+    self._opts = opts
     self._api = api
     self._events = events
     self.plugins = {}
     self.inFocus
-    var allowedapi = {'setConfig': 1, 'getConfig': 1, 'removeConfig': 1}
+    self.allowedapi = {'setConfig': 1, 'getConfig': 1, 'removeConfig': 1}
     self._events.compiler.register('compilationFinished', (success, data, source) => {
       if (self.inFocus) {
         // trigger to the current focus
@@ -54,6 +55,7 @@ module.exports = class PluginManager {
         }))
       }
     })
+
     self._events.app.register('tabChanged', (tabName) => {
       if (self.inFocus && self.inFocus !== tabName) {
         // trigger unfocus
@@ -69,7 +71,7 @@ module.exports = class PluginManager {
         self.inFocus = tabName
         self.post(tabName, JSON.stringify({
           type: 'compilationData',
-          value: self._api.getCompilationResult()
+          value: api.compiler.getCompilationResult()
         }))
       }
     })
@@ -83,10 +85,10 @@ module.exports = class PluginManager {
           result: result
         }))
       }
-      if (event.type === 'message' && this.inFocus && this.plugins[this.inFocus] && this.plugins[this.inFocus].origin === event.origin) {
+      if (event.type === 'message' && self.inFocus && self.plugins[self.inFocus] && self.plugins[self.inFocus].origin === event.origin) {
         var data = JSON.parse(event.data)
-        data.arguments.unshift(this.inFocus)
-        if (allowedapi[data.type]) {
+        data.arguments.unshift(self.inFocus)
+        if (self.allowedapi[data.type]) {
           data.arguments.push((error, result) => {
             response(data.type, data.id, error, result)
           })
@@ -96,11 +98,13 @@ module.exports = class PluginManager {
     }, false)
   }
   register (desc, content) {
-    this.plugins[desc.title] = {content, origin: desc.url}
+    const self = this
+    self.plugins[desc.title] = {content, origin: desc.url}
   }
   post (name, value) {
-    if (this.plugins[name]) {
-      this.plugins[name].content.querySelector('iframe').contentWindow.postMessage(value, this.plugins[name].origin)
+    const self = this
+    if (self.plugins[name]) {
+      self.plugins[name].content.querySelector('iframe').contentWindow.postMessage(value, self.plugins[name].origin)
     }
   }
 }
diff --git a/src/app/tabs/plugin-tab.js b/src/app/tabs/plugin-tab.js
@@ -8,18 +8,18 @@ module.exports = class plugintab {
   constructor (api = {}, events = {}, opts = {}) {
     const self = this
     self.event = new EventManager()
+    self._opts = opts
     self._api = api
     self._events = events
     self._view = { el: null }
-    self.data = { url: opts.url }
     self._components = {}
   }
   render () {
     const self = this
     if (self._view.el) return self._view.el
     self._view.el = yo`
       <div class="${css.pluginTabView}" id="pluginView">
-        <iframe class="${css.iframe}" src="${self.data.url}/index.html"></iframe>
+        <iframe class="${css.iframe}" src="${self._opts.url}/index.html"></iframe>
       </div>`
     return self._view.el
   }