Merge pull request #12 from ethereum/serapathMaster

src/app.js

@@ -708,7 +708,8 @@ function run () {
     udapp: udapp.event
   }
   var righthandPanel = new RighthandPanel(rhpAPI, rhpEvents, {}) // eslint-disable-line
-  self._view.rightpanel.replaceWith(righthandPanel.render())
+  self._view.rightpanel.appendChild(righthandPanel.render())
+  righthandPanel.init()
 
   // ----------------- editor resize ---------------
 

src/app/righthand-panel.js

@@ -60,71 +60,70 @@ function RighthandPanel (appAPI, events, opts) {
 
   self.render = function () { return element }
 
-  ;[...options.children].forEach((el) => { el.classList.add(css.options) })
-
-  // ----------------- toggle right hand panel -----------------
-
-  var hidingRHP = false
-  $('.toggleRHP').click(function () {
-    hidingRHP = !hidingRHP
-    self._api.setEditorSize(hidingRHP ? 0 : appAPI.config.get(EDITOR_WINDOW_SIZE))
-    $('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP)
-    $('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP)
-  })
-
-  // ----------------- tabbed menu -----------------
-  var tabbedMenuAPI = {
-    warnCompilerLoading: appAPI.warnCompilerLoading
-  }
-  // load tabbed menu component
-  var tabEvents = {compiler: events.compiler, app: events.app}
-  tabbedMenu(options, tabbedMenuAPI, tabEvents, {})
-
-  // ----------------- resizeable ui ---------------
-
-  var EDITOR_WINDOW_SIZE = 'editorWindowSize'
-
-  var dragging = false
-  $('#dragbar').mousedown(function (e) {
-    e.preventDefault()
-    dragging = true
-    var main = $('#righthand-panel')
-    var ghostbar = $('<div id="ghostbar">', {
-      css: {
-        top: main.offset().top,
-        left: main.offset().left
-      }
-    }).prependTo('body')
-
-    $(document).mousemove(function (e) {
-      ghostbar.css('left', e.pageX + 2)
+  self.init = function () {
+    ;[...options.children].forEach((el) => { el.classList.add(css.options) })
+      // ----------------- toggle right hand panel -----------------
+
+    var hidingRHP = false
+    $('.toggleRHP').click(function () {
+      hidingRHP = !hidingRHP
+      self._api.setEditorSize(hidingRHP ? 0 : appAPI.config.get(EDITOR_WINDOW_SIZE))
+      $('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP)
+      $('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP)
     })
-  })
 
-  var $body = $('body')
+    // ----------------- tabbed menu -----------------
+    var tabbedMenuAPI = {
+      warnCompilerLoading: appAPI.warnCompilerLoading
+    }
+    // load tabbed menu component
+    var tabEvents = {compiler: events.compiler, app: events.app}
+    tabbedMenu(options, tabbedMenuAPI, tabEvents, {})
+
+    // ----------------- resizeable ui ---------------
+
+    var EDITOR_WINDOW_SIZE = 'editorWindowSize'
+
+    var dragging = false
+    $('#dragbar').mousedown(function (e) {
+      e.preventDefault()
+      dragging = true
+      var main = $('#righthand-panel')
+      var ghostbar = $('<div id="ghostbar">', {
+        css: {
+          top: main.offset().top,
+          left: main.offset().left
+        }
+      }).prependTo('body')
+
+      $(document).mousemove(function (e) {
+        ghostbar.css('left', e.pageX + 2)
+      })
+    })
 
-  function getEditorSize () {
-    return $('#righthand-panel').width()
-  }
+    var $body = $('body')
 
-  $(document).mouseup(function (e) {
-    if (dragging) {
-      var delta = $body.width() - e.pageX + 2
-      $('#ghostbar').remove()
-      $(document).unbind('mousemove')
-      dragging = false
-      delta = (delta < 50) ? 50 : delta
-      self._api.setEditorSize(delta)
-      appAPI.config.set(EDITOR_WINDOW_SIZE, delta)
-      appAPI.reAdjust()
+    function getEditorSize () {
+      return $('#righthand-panel').width()
     }
-  })
 
-  if (appAPI.config.exists(EDITOR_WINDOW_SIZE)) {
-    setTimeout(function () {
+    $(document).mouseup(function (e) {
+      if (dragging) {
+        var delta = $body.width() - e.pageX + 2
+        $('#ghostbar').remove()
+        $(document).unbind('mousemove')
+        dragging = false
+        delta = (delta < 50) ? 50 : delta
+        self._api.setEditorSize(delta)
+        appAPI.config.set(EDITOR_WINDOW_SIZE, delta)
+        appAPI.reAdjust()
+      }
+    })
+
+    if (appAPI.config.exists(EDITOR_WINDOW_SIZE)) {
       self._api.setEditorSize(appAPI.config.get(EDITOR_WINDOW_SIZE))
-    }, 0)
-  } else {
-    appAPI.config.set(EDITOR_WINDOW_SIZE, getEditorSize())
+    } else {
+      appAPI.config.set(EDITOR_WINDOW_SIZE, getEditorSize())
+    }
   }
 }