From 2f25876722f6ef8200dde30aec12341f1eb73e07 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Mon, 9 Oct 2017 09:11:37 -0400
Subject: [PATCH] fix jshint issues

---
 js/embark.js                    | 49 +++++++++++++++++----------------
 lib/contracts/code_generator.js |  2 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/js/embark.js b/js/embark.js
index 54c0c2b9b..1387ef59e 100644
--- a/js/embark.js
+++ b/js/embark.js
@@ -18,6 +18,7 @@ EmbarkJS.isNewWeb3 = function() {
 EmbarkJS.Contract = function(options) {
     var self = this;
     var i, abiElement;
+    var ContractClass;
 
     this.abi = options.abi;
     this.address = options.address;
@@ -28,14 +29,12 @@ EmbarkJS.Contract = function(options) {
       // TODO:
       // add default **from** address
       // add gasPrice
-      var ContractClass = new this.web3.eth.Contract(this.abi, this.address);
+      ContractClass = new this.web3.eth.Contract(this.abi, this.address);
       ContractClass.setProvider(this.web3.currentProvider);
 
       return ContractClass;
     } else {
-
-
-      var ContractClass = this.web3.eth.contract(this.abi);
+      ContractClass = this.web3.eth.contract(this.abi);
 
       this.eventList = [];
 
@@ -362,7 +361,7 @@ EmbarkJS.Messages.setProvider = function(provider, options) {
     var self = this;
     var ipfs;
     if (provider === 'whisper') {
-        this.providerName = 'whisper'
+        this.providerName = 'whisper';
         this.currentMessages = EmbarkJS.Messages.Whisper;
         let provider;
         if (options === undefined) {
@@ -391,7 +390,7 @@ EmbarkJS.Messages.setProvider = function(provider, options) {
             self.currentMessages.whisperVersion = self.currentMessages.web3.version.whisper;
         });
     } else if (provider === 'orbit') {
-        this.providerName = 'orbit'
+        this.providerName = 'orbit';
         this.currentMessages = EmbarkJS.Messages.Orbit;
         if (options === undefined) {
             ipfs = HaadIpfsApi('localhost', '5001');
@@ -420,11 +419,12 @@ EmbarkJS.Messages.listenTo = function(options) {
 EmbarkJS.Messages.Whisper = {};
 
 EmbarkJS.Messages.Whisper.sendMessage = function(options) {
+  var topics, data, ttl, priority, payload;
   if (EmbarkJS.Messages.isNewWeb3()) {
-    var topics = options.topic || options.topics;
-    var data = options.data || options.payload;
-    var ttl = options.ttl || 100;
-    var priority = options.priority || 1000;
+    topics = options.topic || options.topics;
+    data = options.data || options.payload;
+    ttl = options.ttl || 100;
+    priority = options.priority || 1000;
     var powTime = options.powTime || 3;
     var powTarget = options.powTarget || 0.5;
 
@@ -438,7 +438,7 @@ EmbarkJS.Messages.Whisper.sendMessage = function(options) {
 
     topics = this.web3.utils.toHex(topics).slice(0, 10);
 
-    var payload = JSON.stringify(data);
+    payload = JSON.stringify(data);
 
     let message = {
       symKeyID: this.symKeyID, // encrypts using the sym key ID
@@ -452,11 +452,11 @@ EmbarkJS.Messages.Whisper.sendMessage = function(options) {
 
     this.web3.shh.post(message, function() { });
   } else {
-    var topics = options.topic || options.topics;
-    var data = options.data || options.payload;
+    topics = options.topic || options.topics;
+    data = options.data || options.payload;
+    ttl = options.ttl || 100;
+    priority = options.priority || 1000;
     var identity = options.identity || this.identity || web3.shh.newIdentity();
-    var ttl = options.ttl || 100;
-    var priority = options.priority || 1000;
     var _topics;
 
     if (topics === undefined) {
@@ -474,7 +474,7 @@ EmbarkJS.Messages.Whisper.sendMessage = function(options) {
     }
     topics = _topics;
 
-    var payload = JSON.stringify(data);
+    payload = JSON.stringify(data);
 
     var message;
     message = {
@@ -485,13 +485,14 @@ EmbarkJS.Messages.Whisper.sendMessage = function(options) {
       priority: priority
     };
 
-    return EmbarkJS.Messages.currentMessages.web3.shh.post(message, function() { console.log("message sent") });
+    return EmbarkJS.Messages.currentMessages.web3.shh.post(message, function() { });
   }
 };
 
 EmbarkJS.Messages.Whisper.listenTo = function(options) {
+  var topics, _topics, messageEvents;
   if (EmbarkJS.Messages.isNewWeb3()) {
-    var messageEvents = function() {
+    messageEvents = function() {
       this.cb = function() {};
     };
 
@@ -507,8 +508,8 @@ EmbarkJS.Messages.Whisper.listenTo = function(options) {
       this.filter.stopWatching();
     };
 
-    var topics = options.topic || options.topics;
-    var _topics = [];
+    topics = options.topic || options.topics;
+    _topics = [];
 
     let promise = new messageEvents();
 
@@ -539,10 +540,10 @@ EmbarkJS.Messages.Whisper.listenTo = function(options) {
 
     return promise;
   } else {
-    var topics = options.topic || options.topics;
-    var _topics = [];
+    topics = options.topic || options.topics;
+    _topics = [];
 
-    var messageEvents = function() {
+    messageEvents = function() {
       this.cb = function() {};
     };
 
@@ -591,7 +592,7 @@ EmbarkJS.Messages.Whisper.listenTo = function(options) {
 
     return promise;
   }
-}
+};
 
 EmbarkJS.Messages.Orbit = {};
 
diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js
index 9e5262966..abed20b14 100644
--- a/lib/contracts/code_generator.js
+++ b/lib/contracts/code_generator.js
@@ -142,7 +142,7 @@ result += "\n";
         connectionCode += '\n\tweb3 = new Web3(web3.currentProvider);';
         connectionCode += "\n } else if (value !== '$WEB3' && (typeof Web3 !== 'undefined' && ((typeof web3 === 'undefined') || (typeof web3 !== 'undefined' && (!web3.isConnected || (web3.isConnected && !web3.isConnected())))))) {";
 
-        connectionCode += "\n\tweb3 = new Web3(new Web3.providers.HttpProvider(value));"
+        connectionCode += "\n\tweb3 = new Web3(new Web3.providers.HttpProvider(value));";
 
         connectionCode += "\n}";