Merge pull request #58 from yann300/fea1

0.0.2 version

Merge pull request #58 from yann300/fea1
4d3c7dee · yann300 · GitHub · 49610eb9 · a786c7a1 · 4d3c7dee
Commit 4d3c7dee authored Jul 18, 2016 by yann300 Committed by GitHub Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 11 deletions

index.html index.html +8 -1

index.js index.js +0 -2

package.json package.json +4 -3

index.js src/index.js +10 -5

No files found.
--- a/index.html
+++ b/index.html
@@ -2,7 +2,14 @@
 <html>
  <head>
  </head>
-  <body>
+  <body onload="loadDebugger()" >
+    <script type="text/javascript">
+      function loadDebugger() {
+        var container = document.getElementById('app')
+        container.vmdebugger = new window.remix.Debugger()
+        container.appendChild(container.vmdebugger.render())
+      }
+    </script>
    <div id="app"></div>
    <script src="build/app.js"></script>
  </body>

--- a/index.js
+++ b/index.js
-var Debugger = require('./src/Ethdebugger')
-module.exports = Debugger
--- a/package.json
+++ b/package.json
 {
  "name": "ethereum-remix",
-  "version": "0.0.1",
+  "version": "0.0.2-alpha.0.0.1",
  "description": "Ethereum IDE and tools for the web",
  "contributors": [
    {
@@ -12,7 +12,7 @@
      "email": "liana@ethdev.com"
    }
  ],
-  "main": "index.js",
+  "main": "./build/app.js",
  "dependencies": {
    "browserify": "^13.0.1",
    "web3": "^0.15.3",
@@ -35,7 +35,8 @@
    "nightwatch_remote_firefox": "nightwatch --config nightwatch.js --env default",
    "nightwatch_remote_chrome": "nightwatch --config nightwatch.js --env chrome",
    "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
-    "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie"
+    "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie",
+    "prepublish": "npm run build"
  },
  "repository": {
    "type": "git",

--- a/src/index.js
+++ b/src/index.js
 'use strict'
 var Debugger = require('./Ethdebugger')
-function init () {
-  var container = document.getElementById('app')
-  container.vmdebugger = new Debugger()
-  container.appendChild(container.vmdebugger.render())
+if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
+  module.exports = {
+    Debugger: Debugger
+  }
 }
-init()
+if (window) {
+  window.remix = {
+    Debugger: Debugger
+  }
+}
+