Merge branch 'master' into develop

ethereum · Dec 14, 2016 · 287598b · 287598b
2 parents 8a4c31c + 226ef4f
commit 287598b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 29 deletions.
diff --git a/interface/client/collections.js b/interface/client/collections.js
@@ -37,4 +37,4 @@ if (typeof window.dbSync !== 'undefined') {
 //         checkpoint: 0
 //     });
 
-// Blockchain = new Mongo.Collection('blockchain', {connection: null});
+// Blockchain = new Mongo.Collection('blockchain', {connection: null});
diff --git a/interface/client/lib/signatures.js b/interface/client/lib/signatures.js
@@ -10016,4 +10016,4 @@ window.SIGNATURES = {
     "0x38bbfa50": [
         "__callback(bytes32,string,bytes)"
     ]
-};
+};
diff --git a/interface/client/templates/layout/browserBar.js b/interface/client/templates/layout/browserBar.js
@@ -88,7 +88,7 @@ Template['layout_browserBar'].events({
     */
     'click button.reload': function(){
         var webview = Helpers.getWebview(LocalStore.get('selectedTab'));
-        
+
         if(webview)
             webview.reload();
     },
@@ -101,7 +101,7 @@ Template['layout_browserBar'].events({
     */
     'click button.remove-tab': function(){
         var tabId = LocalStore.get('selectedTab');
-        
+
         Tabs.remove(tabId);
         LocalStore.set('selectedTab', 'browser');
     },
@@ -123,10 +123,10 @@ Template['layout_browserBar'].events({
 
         });
     },
-    /* 
+    /*
     Hide the app bar on input blur
-    
-    @event blur 
+
+    @event blur
     */
     'blur .app-bar > form.url .url-input': function(e, template) {
         template.$('.app-bar').removeClass('show-bar');
@@ -154,7 +154,7 @@ Template['layout_browserBar'].events({
         var url = Helpers.sanitizeUrl(url);
         var tabId = Helpers.getTabIdByUrl(url);
 
-        console.log('Submitted new URL:'+ url); 
+        console.log('Submitted new URL:'+ url);
 
         // update current tab url
         Tabs.update(tabId, {$set: {

diff --git a/interface/client/templates/popupWindows/splashScreen.js b/interface/client/templates/popupWindows/splashScreen.js
@@ -38,7 +38,7 @@ Template['popupWindows_splashScreen'].onCreated(function(){
         TemplateVar.set(template, 'text', TAPi18n.__('mist.startScreen.clientBinaries.' + status));
         TemplateVar.set(template, 'showNetworkIndicator', status === 'done');
         TemplateVar.set(template, 'showProgressBar', false);
-        TemplateVar.set(template, 'showStartAppButton', false);            
+        TemplateVar.set(template, 'showStartAppButton', false);
         TemplateVar.set(template, 'logText', null);
     });
 
@@ -78,7 +78,7 @@ Template['popupWindows_splashScreen'].onCreated(function(){
 
             case 'error':
                 errorTag = 'mist.startScreen.' + (errorTag || 'nodeError');
-                
+
                 TemplateVar.set(template, 'text', TAPi18n.__(errorTag));
                 break;
         }
@@ -96,17 +96,17 @@ Template['popupWindows_splashScreen'].onCreated(function(){
             if (data !== false) {
                 // if state is "in progress" and we have data
                 showNodeLog = false;
-                var translationString = '';                    
+                var translationString = '';
 
                 // add the data received to the object lastSyncData
                 lastSyncData = _.extend(lastSyncData, data || {});
-                
+
                 // Select the appropriate message
                 if(web3.net.peerCount > 0) {
                     // Check which state we are
                     if  (   0 < lastSyncData._displayKnownStates && (
-                            Number(lastSyncData.pulledStates) !== Math.round(lastSyncData._displayState) 
-                        ||  Number(lastSyncData.knownStates) !== Math.round(lastSyncData._displayKnownStates)) 
+                            Number(lastSyncData.pulledStates) !== Math.round(lastSyncData._displayState)
+                        ||  Number(lastSyncData.knownStates) !== Math.round(lastSyncData._displayKnownStates))
                     ) {
                         // Mostly downloading new states
                         translationString = 'mist.startScreen.nodeSyncInfoStates';
@@ -116,8 +116,8 @@ Template['popupWindows_splashScreen'].onCreated(function(){
                     }
                 } else {
                     // Not online
-                    translationString = 'mist.startScreen.nodeSyncConnecting';                    
-                } 
+                    translationString = 'mist.startScreen.nodeSyncConnecting';
+                }
 
                 // Saves data as numbers (hex)
                 lastSyncData._highestBlock = lastSyncData.highestBlock;
@@ -131,9 +131,9 @@ Template['popupWindows_splashScreen'].onCreated(function(){
             } else {
                 // It's not connected anymore
                 if (web3.net.peerCount > 1) {
-                    translationString = 'mist.startScreen.nodeSyncFoundPeers';                    
+                    translationString = 'mist.startScreen.nodeSyncFoundPeers';
                 } else {
-                    translationString = 'mist.startScreen.nodeSyncConnecting';                    
+                    translationString = 'mist.startScreen.nodeSyncConnecting';
                 }
 
                 TemplateVar.set(template, 'lastSyncData', {'peers': web3.net.peerCount});
@@ -163,7 +163,7 @@ Template['popupWindows_splashScreen'].helpers({
     @method iconPath
     */
     'iconPath': function(){
-        return 'file://'+ window.dirname +'/icons/'+ window.mistMode +'/icon2x.png';
+        return 'file://' + window.dirname + '/icons/' + window.mistMode + '/icon2x.png';
     },
     /**
     Updates the Sync Message live
@@ -186,7 +186,7 @@ Template['popupWindows_splashScreen'].helpers({
                 // initialize the display numbers
                 syncData._displayBlock = Number(syncData.currentBlock);
                 syncData._displayState = Number(syncData.pulledStates || 0);
-                syncData._displayKnownStates = Number(syncData.knownStates || 0);                    
+                syncData._displayKnownStates = Number(syncData.knownStates || 0);
             } else {
                 // Increment each them slowly to match target number
                 syncData._displayBlock += (Number(syncData.currentBlock) - syncData._displayBlock) / 10;
@@ -209,11 +209,11 @@ Template['popupWindows_splashScreen'].helpers({
             }
 
             var progress = ((lastSyncData._displayBlock - Number(lastSyncData.startingBlock)) / (Number(lastSyncData._highestBlock) - Number(lastSyncData.startingBlock))) * 100 ;
-                    
+
             // Saves data back to templates
             TemplateVar.set(template, "syncStatusMessageLive", translatedMessage);
             TemplateVar.set(template, 'lastSyncData', syncData);
-            
+
             // set progress value
             if(_.isFinite(progress)) {
                 TemplateVar.set(template, 'showProgressBar', true);
@@ -234,5 +234,5 @@ Template['popupWindows_splashScreen'].helpers({
 Template['popupWindows_splashScreen'].events({
    'click .start-app': function(){
         ipc.send('backendAction_skipSync');
-   } 
+   }
 });
diff --git a/modules/ipc/methods/eth_coinbase.js b/modules/ipc/methods/eth_coinbase.js
@@ -1,5 +1,3 @@
-
-
 const _ = global._;
 const BaseProcessor = require('./base');
 const db = require('../../db');
@@ -24,8 +22,6 @@ module.exports = class extends BaseProcessor {
                 payload.result = null;
             }
         }
-
         return super.sanitizeResponsePayload(conn, payload, isPartOfABatch);
     }
 };
-
diff --git a/modules/preloader/mistUI.js b/modules/preloader/mistUI.js
@@ -13,7 +13,6 @@ const Web3 = require('web3');
 const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js');
 const web3Admin = require('../web3Admin.js');
 
-
 require('./include/setBasePath')('interface');
 
 

diff --git a/modules/preloader/popupWindowsNoWeb3.js b/modules/preloader/popupWindowsNoWeb3.js
@@ -6,7 +6,6 @@ require('./include/common')('popupWindow');
 const { ipcRenderer, remote, webFrame } = require('electron');
 const mist = require('./include/mistAPI.js');
 const dbSync = require('../dbSync.js');
-
 require('./include/setBasePath')('interface');
 require('./include/openExternal.js');