Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspec

2 files changed, 14 insertions, 18 deletions

diff --git a/example/balance.html b/example/balance.html
index d70ea648b..60b8bbe87 100644
--- a/example/balance.html
+++ b/example/balance.html
@@ -8,23 +8,21 @@
 <script type="text/javascript">
    
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.AutoProvider());
+    web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
 
     function watchBalance() {
         var coinbase = web3.eth.coinbase;
         var originalBalance = 0;
 
-        web3.eth.balanceAt(coinbase).then(function (balance) {
-            originalBalance = web3.toDecimal(balance);
-            document.getElementById('original').innerText = 'original balance: ' + originalBalance + '    watching...';
-        });
+        var balance = web3.eth.balanceAt(coinbase);
+        var originalBalance = web3.toDecimal(balance);
+        document.getElementById('original').innerText = 'original balance: ' + originalBalance + '    watching...';
 
         web3.eth.watch({altered: coinbase}).changed(function() {
-            web3.eth.balanceAt(coinbase).then(function (balance) {
-                var currentBalance = web3.toDecimal(balance);
-                document.getElementById("current").innerText = 'current: ' + currentBalance;
-                document.getElementById("diff").innerText = 'diff:    ' + (currentBalance - originalBalance);
-            });
+            balance = web3.eth.balanceAt(coinbase)
+            var currentBalance = web3.toDecimal(balance);
+            document.getElementById("current").innerText = 'current: ' + currentBalance;
+            document.getElementById("diff").innerText = 'diff:    ' + (currentBalance - originalBalance);
         });
     }
 
diff --git a/example/contract.html b/example/contract.html
index a3f0df176..3d0260d34 100644
--- a/example/contract.html
+++ b/example/contract.html
@@ -8,7 +8,7 @@
 <script type="text/javascript">
 
     var web3 = require('web3');
-    web3.setProvider(new web3.providers.AutoProvider());
+    web3.setProvider(new web3.providers.HttpSyncProvider());
 
     // solidity source code
     var source = "" + 
@@ -43,10 +43,9 @@
         document.getElementById('source').innerText = source;
 
         // create contract
-        web3.eth.transact({code: web3.eth.solidity(source)}).then(function (address) {
-            contract = web3.eth.contract(address, desc);
-            document.getElementById('call').style.visibility = 'visible';
-        });
+        var address = web3.eth.transact({code: web3.eth.solidity(source)});
+        contract = web3.eth.contract(address, desc);
+        document.getElementById('call').style.visibility = 'visible';
     }
 
     function callExampleContract() {
@@ -54,9 +53,8 @@
         var param = parseInt(document.getElementById('value').value);
 
         // call the contract
-        contract.multiply(param).call().then(function(res) {
-            document.getElementById('result').innerText = res[0];
-        });
+        var res = contract.multiply(param).call();
+        document.getElementById('result').innerText = res[0];
     }
 
 </script>