diff --git a/src/app.js b/src/app.js index 58a2e5fd28..8f5b4ec764 100644 --- a/src/app.js +++ b/src/app.js @@ -127,42 +127,42 @@ var run = function() { if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) return; - var obj = {} + var obj = {}; var done = false; - var count = 0 + var count = 0; var dont = 0; function check(key){ chrome.storage.sync.get( key, function(resp){ - console.log("comparing to cloud", key, resp) + console.log("comparing to cloud", key, resp); if (typeof resp[key] != 'undefined' && obj[key] !== resp[key] && confirm("Overwrite '" + fileNameFromKey(key) + "'? Click Ok to overwrite local file with file from cloud. Cancel will push your local file to the cloud.")) { - console.log("Overwriting", key ) + console.log("Overwriting", key ); localStorage.setItem( key, resp[key] ); updateFiles(); } else { - console.log( "add to obj", obj, key) + console.log( "add to obj", obj, key); obj[key] = localStorage[key]; } - done++ + done++; if (done >= count) chrome.storage.sync.set( obj, function(){ - console.log( "updated cloud files with: ", obj, this, arguments) - }) - }) + console.log( "updated cloud files with: ", obj, this, arguments); + }); + }); } for (var y in window.localStorage) { - console.log("checking", y) + console.log("checking", y); obj[y] = window.localStorage.getItem(y); if (y.indexOf(SOL_CACHE_FILE_PREFIX) !== 0) continue; count++; - check(y) + check(y); } } window.syncStorage = syncStorage; - syncStorage() + syncStorage(); @@ -194,14 +194,14 @@ var run = function() { var files = getFiles(); for (var x in files) { - sessions[files[x]] = newEditorSession(files[x]) + sessions[files[x]] = newEditorSession(files[x]); } editor.setSession( sessions[SOL_CACHE_FILE] ); editor.resize(true); function newEditorSession(filekey) { - var s = new ace.EditSession(window.localStorage[filekey], "ace/mode/javascript") + var s = new ace.EditSession(window.localStorage[filekey], "ace/mode/javascript"); s.setUndoManager(new ace.UndoManager()); s.setTabSize(4); s.setUseSoftTabs(true); @@ -324,7 +324,7 @@ var run = function() { $filesEl.animate({left: Math.max( (0 - activeFilePos() + (FILE_SCROLL_DELTA/2)), 0)+ "px"}, "slow", function(){ reAdjust(); - }) + }); }); $filesEl.on('click', '.file:not(.active)', showFileHandler); @@ -360,7 +360,7 @@ var run = function() { } return false; - }) + }); $filesEl.on('click', '.file .remove', function(ev) { ev.preventDefault(); @@ -445,19 +445,19 @@ var run = function() { itemsWidth += itemWidth; }); return itemsWidth; - }; + } function widthOfHidden(){ return (($filesWrapper.outerWidth()) - widthOfList() - getLeftPosi()); - }; + } function widthOfVisible(){ return $filesWrapper.outerWidth(); - }; + } function getLeftPosi(){ return $filesEl.position().left; - }; + } function activeFilePos() { var el = $filesEl.find('.active'); @@ -481,14 +481,14 @@ var run = function() { } $scrollerRight.click(function() { - var delta = (getLeftPosi() - FILE_SCROLL_DELTA) + var delta = (getLeftPosi() - FILE_SCROLL_DELTA); $filesEl.animate({left: delta + "px"},'slow',function(){ reAdjust(); }); }); $scrollerLeft.click(function() { - var delta = Math.min( (getLeftPosi() + FILE_SCROLL_DELTA), 0 ) + var delta = Math.min( (getLeftPosi() + FILE_SCROLL_DELTA), 0 ); $filesEl.animate({left: delta + "px"},'slow',function(){ reAdjust(); }); @@ -769,7 +769,7 @@ var run = function() { case 'compiled': compilationFinished(data.data, data.missingInputs); break; - }; + } }); worker.onerror = function(msg) { console.log(msg.data); }; worker.addEventListener('error', function(msg) { console.log(msg.data); }); @@ -809,7 +809,7 @@ var run = function() { editor.on('changeSession', function(){ editor.getSession().on('change', onChange); onChange(); - }) + }); document.querySelector('#optimize').addEventListener('change', function(){ updateQueryParams({optimize: document.querySelector('#optimize').checked }); @@ -984,7 +984,7 @@ var run = function() { return $('
').append(button).append(details); }; var formatGasEstimates = function(data) { - var gasToText = function(g) { return g === null ? 'unknown' : g; } + var gasToText = function(g) { return g === null ? 'unknown' : g; }; var text = ''; if ('creation' in data) text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n'; @@ -1033,7 +1033,7 @@ var run = function() { return funABI; }; - syncStorage() + syncStorage(); }; diff --git a/src/mode-solidity.js b/src/mode-solidity.js index d12d30cee0..b1f47e5a8e 100644 --- a/src/mode-solidity.js +++ b/src/mode-solidity.js @@ -27,7 +27,7 @@ DocCommentHighlightRules.getTagRule = function(start) { token : "comment.doc.tag.storage.type", regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b" }; -} +}; DocCommentHighlightRules.getStartRule = function(start) { return { diff --git a/src/universal-dapp.js b/src/universal-dapp.js index 4701024138..2a74b37d81 100644 --- a/src/universal-dapp.js +++ b/src/universal-dapp.js @@ -16,14 +16,14 @@ function UniversalDApp (contracts, options) { if (!options.vm && web3.currentProvider) { } else if (options.vm) { - this.accounts = {} + this.accounts = {}; this.BN = ethJSUtil.BN; this.stateTrie = new Trie(); this.vm = new EthJSVM(this.stateTrie, null, { activatePrecompiles: true }); - this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511') - this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c') + this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'); + this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c'); } else { var host = options.host || "localhost"; var port = options.port || "8545"; @@ -35,7 +35,7 @@ function UniversalDApp (contracts, options) { UniversalDApp.prototype.addAccount = function (privateKey, balance) { if (this.accounts) { - privateKey = new Buffer(privateKey, 'hex') + privateKey = new Buffer(privateKey, 'hex'); var address = ethJSUtil.privateToAddress(privateKey); // FIXME: we don't care about the callback, but we should still make this proper @@ -92,7 +92,7 @@ UniversalDApp.prototype.render = function () { } else { var $title = $('').text( this.contracts[c].name ); if (this.contracts[c].bytecode) { - $title.append($('').text((this.contracts[c].bytecode.length / 2) + ' bytes')) + $title.append($('').text((this.contracts[c].bytecode.length / 2) + ' bytes')); } $contractEl.append( $title ).append( this.getCreateInterface( $contractEl, this.contracts[c]) ); } @@ -102,14 +102,14 @@ UniversalDApp.prototype.render = function () { $legend = $('') .append( $('').text('Attach') ) .append( $('').text('Transact') ) - .append( $('').text('Call') ) + .append( $('').text('Call') ); this.$el.append( $('') - .html("Universal ÐApp powered by The Blockchain") ) + .html("Universal ÐApp powered by The Blockchain") ); - this.$el.append( $legend ) + this.$el.append( $legend ); return this.$el; -} +}; UniversalDApp.prototype.getContractByName = function(contractName) { for (var c in this.contracts) @@ -121,8 +121,8 @@ UniversalDApp.prototype.getContractByName = function(contractName) { UniversalDApp.prototype.getABIInputForm = function (cb){ var self = this; var $el = $(''); - var $jsonInput = $('') - var $createButton = $('').text('Create a Universal ÐApp') + var $jsonInput = $(''); + var $createButton = $('').text('Create a Universal ÐApp'); $createButton.click(function(ev){ var contracts = $.parseJSON( $jsonInput.val() ); if (cb) { @@ -133,30 +133,30 @@ UniversalDApp.prototype.getABIInputForm = function (cb){ } catch(e) { err = e; } - cb( err, dapp ) + cb( err, dapp ); } else { self.contracts = contracts; - self.$el.empty().append( self.render() ) + self.$el.empty().append( self.render() ); } - }) - $el.append( $jsonInput ).append( $createButton ) + }); + $el.append( $jsonInput ).append( $createButton ); return $el; -} +}; UniversalDApp.prototype.getCreateInterface = function ($container, contract) { var self = this; var $createInterface = $(''); if (this.options.removable) { - var $close = $('') - $close.click( function(){ self.$el.remove(); } ) + var $close = $(''); + $close.click( function(){ self.$el.remove(); } ); $createInterface.append( $close ); } - var $newButton = this.getInstanceInterface( contract ) - var $atButton = $('').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ) } ); + var $newButton = this.getInstanceInterface( contract ); + var $atButton = $('').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ); } ); $createInterface.append( $atButton ).append( $newButton ); return $createInterface; -} +}; UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) { var self = this; @@ -175,8 +175,8 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar var $instance = $(''); if (self.options.removable_instances) { - var $close = $('') - $close.click( function(){ $instance.remove(); } ) + var $close = $(''); + $close.click( function(){ $instance.remove(); } ); $instance.append( $close ); } var context = self.options.vm ? 'memory' : 'blockchain'; @@ -188,17 +188,17 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar $events = $(''); var parseLogs = function(err,response) { - $event = $('') + $event = $(''); - var $close = $('') - $close.click( function(){ $event.remove(); } ) + var $close = $(''); + $close.click( function(){ $event.remove(); } ); $event.append( $('').text(response.event) ) .append( $('').text( JSON.stringify(response.args, null, 2) ) ) .append( $close ); $events.append( $event ); - } + }; if (self.options.vm){ // FIXME: support indexed events @@ -207,7 +207,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar $.each(abi, function(i, funABI) { if (funABI.type !== 'event') return; - var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function(item) { return item.type })) + var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function(item) { return item.type; })); eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs }; }); @@ -224,7 +224,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar return item.type; }); decoded = ethJSABI.rawDecode(types, log[2]); - decoded = ethJSABI.stringify(types, decoded) + decoded = ethJSABI.stringify(types, decoded); } catch (e) { decoded = '0x' + log[2].toString('hex'); } @@ -260,7 +260,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar })); }); ($el || $createInterface ).append( $instance.append( $events ) ); - } + }; if (!address || !$target) { $createInterface.append( this.getCallButton({ @@ -278,7 +278,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar } return $createInterface; -} +}; UniversalDApp.prototype.getConstructorInterface = function(abi) { var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]}; @@ -288,7 +288,7 @@ UniversalDApp.prototype.getConstructorInterface = function(abi) { break; } return funABI; -} +}; UniversalDApp.prototype.getCallButton = function(args) { var self = this; @@ -309,18 +309,18 @@ UniversalDApp.prototype.getCallButton = function(args) { var getReturnOutput = function(result) { var returnName = lookupOnly ? 'Value' : 'Result'; var returnCls = lookupOnly ? 'value' : 'returned'; - return $('