From 3d4e5c0af009b039b7fe813fc4db5df21514a868 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 6 Jul 2016 10:37:28 +0200
Subject: [PATCH] use of yo-yoify

---
 ci/browser_tests.sh    |  8 ++++----
 package.json           |  7 ++++---
 src/ButtonNavigator.js | 19 ++++++++++++++++++-
 src/CalldataPanel.js   |  4 +---
 src/CallstackPanel.js  |  4 +---
 src/MemoryPanel.js     |  4 +---
 src/Slider.js          | 12 +++++++++++-
 src/StackPanel.js      |  4 +---
 src/StoragePanel.js    |  4 +---
 9 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index ccfd5b4270..d691149cc1 100644
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -16,9 +16,9 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-#npm run nightwatch_remote_firefox
-#npm run nightwatch_remote_chrome
+npm run nightwatch_remote_firefox
+npm run nightwatch_remote_chrome
 #npm run nightwatch_remote_safari
-npm run nightwatch_remote_ie
+#npm run nightwatch_remote_ie
 
-curl "https://saucelabs.com/rest/v1/${SAUCECONNECT_USERNAME}/tunnels/${SAUCECONNECT_JOBIDENTIFIER}" -u "${SAUCECONNECT_USERNAME}:${SAUCECONNECT_ACCESSKEY}" -X DELETE
+curl "http://saucelabs.com/rest/v1/${SAUCECONNECT_USERNAME}/tunnels/${SAUCECONNECT_JOBIDENTIFIER}" -u "${SAUCECONNECT_USERNAME}:${SAUCECONNECT_ACCESSKEY}" -X DELETE
diff --git a/package.json b/package.json
index 4285f8852f..7a411ea83a 100644
--- a/package.json
+++ b/package.json
@@ -23,18 +23,19 @@
     "nightwatch": "^0.9.5",
     "standard": "^7.0.1",
     "standard-reporter": "^1.0.5",
-    "tape": "^4.6.0"
+    "tape": "^4.6.0",
+    "yo-yoify": "^3.1.0"
   },
   "scripts": {
     "start_node": "eth --rpccorsdomain \"*\" -j -v 0",
-    "build": "mkdir -p build; browserify src/index.js -o build/app.js",
+    "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js",
     "test": "standard && tape ./test/tests.js",
     "serve": "http-server .",
     "nightwatch_local": "nightwatch --config nightwatch.js --env local",
     "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"
   },
   "repository": {
     "type": "git",
diff --git a/src/ButtonNavigator.js b/src/ButtonNavigator.js
index e88b2dd383..a88f76ef9f 100644
--- a/src/ButtonNavigator.js
+++ b/src/ButtonNavigator.js
@@ -65,9 +65,26 @@ ButtonNavigator.prototype.stepChanged = function (step) {
         self.overForwardDisabled = step >= length - 1
         self.nextCallDisabled = step >= length - 1
       }
+      self.updateAll()
     })
   }
-  yo.update(this.view, this.render())
+  this.updateAll()
+}
+
+ButtonNavigator.prototype.updateAll = function () {
+  this.updateDisabled('intoback', this.intoBackDisabled)
+  this.updateDisabled('overback', this.overBackDisabled)
+  this.updateDisabled('overforward', this.overForwardDisabled)
+  this.updateDisabled('intoforward', this.intoForwardDisabled)
+  this.updateDisabled('nextcall', this.nextCallDisabled)
+}
+
+ButtonNavigator.prototype.updateDisabled = function (id, disabled) {
+  if (disabled) {
+    document.getElementById(id).setAttribute('disabled', true)
+  } else {
+    document.getElementById(id).removeAttribute('disabled')
+  }
 }
 
 module.exports = ButtonNavigator
diff --git a/src/CalldataPanel.js b/src/CalldataPanel.js
index e953084463..759add9b2d 100644
--- a/src/CalldataPanel.js
+++ b/src/CalldataPanel.js
@@ -10,9 +10,7 @@ function CalldataPanel (_parent, _traceManager) {
 }
 
 CalldataPanel.prototype.render = function () {
-  return (
-  yo`${this.basicPanel.render()}`
-  )
+  return yo`<div>${this.basicPanel.render()}</div>`
 }
 
 CalldataPanel.prototype.init = function () {
diff --git a/src/CallstackPanel.js b/src/CallstackPanel.js
index 5e40252498..039dce19e1 100644
--- a/src/CallstackPanel.js
+++ b/src/CallstackPanel.js
@@ -10,9 +10,7 @@ function CallstackPanel (_parent, _traceManager) {
 }
 
 CallstackPanel.prototype.render = function () {
-  return (
-  yo`${this.basicPanel.render()}`
-  )
+  return yo`<div>${this.basicPanel.render()}</div>`
 }
 
 CallstackPanel.prototype.init = function () {
diff --git a/src/MemoryPanel.js b/src/MemoryPanel.js
index 8e90882c74..81e1a2ec2d 100644
--- a/src/MemoryPanel.js
+++ b/src/MemoryPanel.js
@@ -11,9 +11,7 @@ function MemoryPanel (_parent, _traceManager) {
 }
 
 MemoryPanel.prototype.render = function () {
-  return (
-  yo`${this.basicPanel.render()}`
-  )
+  return yo`<div>${this.basicPanel.render()}</div>`
 }
 
 MemoryPanel.prototype.init = function () {
diff --git a/src/Slider.js b/src/Slider.js
index a2390f79f9..1be5149f5c 100644
--- a/src/Slider.js
+++ b/src/Slider.js
@@ -34,9 +34,11 @@ Slider.prototype.render = function () {
 }
 
 Slider.prototype.init = function (length) {
+  var slider = document.getElementById('slider')
+  slider.setAttribute('max', length)
   this.max = length
+  this.updateDisabled(length === 0)
   this.disabled = length === 0
-  yo.update(this.view, this.render())
   this.setValue(0)
 }
 
@@ -55,4 +57,12 @@ Slider.prototype.setValue = function (value) {
   }
 }
 
+Slider.prototype.updateDisabled = function (disabled) {
+  if (disabled) {
+    document.getElementById('slider').setAttribute('disabled', true)
+  } else {
+    document.getElementById('slider').removeAttribute('disabled')
+  }
+}
+
 module.exports = Slider
diff --git a/src/StackPanel.js b/src/StackPanel.js
index 63fc303cc0..aa2aaa6944 100644
--- a/src/StackPanel.js
+++ b/src/StackPanel.js
@@ -11,9 +11,7 @@ function StackPanel (_parent, _traceManager) {
 }
 
 StackPanel.prototype.render = function () {
-  return (
-  yo`${this.basicPanel.render()}`
-  )
+  return yo`<div>${this.basicPanel.render()}</div>`
 }
 
 StackPanel.prototype.init = function () {
diff --git a/src/StoragePanel.js b/src/StoragePanel.js
index 97f81a561d..7b4f9e9add 100644
--- a/src/StoragePanel.js
+++ b/src/StoragePanel.js
@@ -10,9 +10,7 @@ function StoragePanel (_parent, _traceManager) {
 }
 
 StoragePanel.prototype.render = function () {
-  return (
-  yo`${this.basicPanel.render()}`
-  )
+  return yo`<div>${this.basicPanel.render()}</div>`
 }
 
 StoragePanel.prototype.init = function () {