mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Use semicolons consistently

Browse Source
pull/1/head
Alex Beregszaszi 9 years ago
parent ed460f09c6
commit de1d7edf20
3 changed files with 74 additions and 74 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 52
      src/app.js
  2. 2
      src/mode-solidity.js
  3. 94
      src/universal-dapp.js

52
src/app.js
Unescape View File

@ -127,42 +127,42 @@ var run = function() {
if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) return; if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) return;
var obj = {} var obj = {};
var done = false; var done = false;
var count = 0 var count = 0;
var dont = 0; var dont = 0;
function check(key){ function check(key){
chrome.storage.sync.get( key, function(resp){ 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.")) { 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] ); localStorage.setItem( key, resp[key] );
updateFiles(); updateFiles();
} else { } else {
console.log( "add to obj", obj, key) console.log( "add to obj", obj, key);
obj[key] = localStorage[key]; obj[key] = localStorage[key];
} }
done++ done++;
if (done >= count) chrome.storage.sync.set( obj, function(){ 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) { for (var y in window.localStorage) {
console.log("checking", y) console.log("checking", y);
obj[y] = window.localStorage.getItem(y); obj[y] = window.localStorage.getItem(y);
if (y.indexOf(SOL_CACHE_FILE_PREFIX) !== 0) continue; if (y.indexOf(SOL_CACHE_FILE_PREFIX) !== 0) continue;
count++; count++;
check(y) check(y);
} }
} }
window.syncStorage = syncStorage; window.syncStorage = syncStorage;
syncStorage() syncStorage();
@ -194,14 +194,14 @@ var run = function() {
var files = getFiles(); var files = getFiles();
for (var x in files) { for (var x in files) {
sessions[files[x]] = newEditorSession(files[x]) sessions[files[x]] = newEditorSession(files[x]);
} }
editor.setSession( sessions[SOL_CACHE_FILE] ); editor.setSession( sessions[SOL_CACHE_FILE] );
editor.resize(true); editor.resize(true);
function newEditorSession(filekey) { 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.setUndoManager(new ace.UndoManager());
s.setTabSize(4); s.setTabSize(4);
s.setUseSoftTabs(true); 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(){ $filesEl.animate({left: Math.max( (0 - activeFilePos() + (FILE_SCROLL_DELTA/2)), 0)+ "px"}, "slow", function(){
reAdjust(); reAdjust();
}) });
}); });
$filesEl.on('click', '.file:not(.active)', showFileHandler); $filesEl.on('click', '.file:not(.active)', showFileHandler);
@ -360,7 +360,7 @@ var run = function() {
} }
return false; return false;
}) });
$filesEl.on('click', '.file .remove', function(ev) { $filesEl.on('click', '.file .remove', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -445,19 +445,19 @@ var run = function() {
itemsWidth += itemWidth; itemsWidth += itemWidth;
}); });
return itemsWidth; return itemsWidth;
}; }
function widthOfHidden(){ function widthOfHidden(){
return (($filesWrapper.outerWidth()) - widthOfList() - getLeftPosi()); return (($filesWrapper.outerWidth()) - widthOfList() - getLeftPosi());
}; }
function widthOfVisible(){ function widthOfVisible(){
return $filesWrapper.outerWidth(); return $filesWrapper.outerWidth();
}; }
function getLeftPosi(){ function getLeftPosi(){
return $filesEl.position().left; return $filesEl.position().left;
}; }
function activeFilePos() { function activeFilePos() {
var el = $filesEl.find('.active'); var el = $filesEl.find('.active');
@ -481,14 +481,14 @@ var run = function() {
} }
$scrollerRight.click(function() { $scrollerRight.click(function() {
var delta = (getLeftPosi() - FILE_SCROLL_DELTA) var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
$filesEl.animate({left: delta + "px"},'slow',function(){ $filesEl.animate({left: delta + "px"},'slow',function(){
reAdjust(); reAdjust();
}); });
}); });
$scrollerLeft.click(function() { $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(){ $filesEl.animate({left: delta + "px"},'slow',function(){
reAdjust(); reAdjust();
}); });
@ -769,7 +769,7 @@ var run = function() {
case 'compiled': case 'compiled':
compilationFinished(data.data, data.missingInputs); compilationFinished(data.data, data.missingInputs);
break; break;
}; }
}); });
worker.onerror = function(msg) { console.log(msg.data); }; worker.onerror = function(msg) { console.log(msg.data); };
worker.addEventListener('error', 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.on('changeSession', function(){
editor.getSession().on('change', onChange); editor.getSession().on('change', onChange);
onChange(); onChange();
}) });
document.querySelector('#optimize').addEventListener('change', function(){ document.querySelector('#optimize').addEventListener('change', function(){
updateQueryParams({optimize: document.querySelector('#optimize').checked }); updateQueryParams({optimize: document.querySelector('#optimize').checked });
@ -984,7 +984,7 @@ var run = function() {
return $('<div class="contractDetails"/>').append(button).append(details); return $('<div class="contractDetails"/>').append(button).append(details);
}; };
var formatGasEstimates = function(data) { var formatGasEstimates = function(data) {
var gasToText = function(g) { return g === null ? 'unknown' : g; } var gasToText = function(g) { return g === null ? 'unknown' : g; };
var text = ''; var text = '';
if ('creation' in data) if ('creation' in data)
text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n'; text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n';
@ -1033,7 +1033,7 @@ var run = function() {
return funABI; return funABI;
}; };
syncStorage() syncStorage();
}; };

2
src/mode-solidity.js
Unescape View File

@ -27,7 +27,7 @@ DocCommentHighlightRules.getTagRule = function(start) {
token : "comment.doc.tag.storage.type", token : "comment.doc.tag.storage.type",
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b" regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
}; };
} };
DocCommentHighlightRules.getStartRule = function(start) { DocCommentHighlightRules.getStartRule = function(start) {
return { return {

94
src/universal-dapp.js
Unescape View File

@ -16,14 +16,14 @@ function UniversalDApp (contracts, options) {
if (!options.vm && web3.currentProvider) { if (!options.vm && web3.currentProvider) {
} else if (options.vm) { } else if (options.vm) {
this.accounts = {} this.accounts = {};
this.BN = ethJSUtil.BN; this.BN = ethJSUtil.BN;
this.stateTrie = new Trie(); this.stateTrie = new Trie();
this.vm = new EthJSVM(this.stateTrie, null, { activatePrecompiles: true }); this.vm = new EthJSVM(this.stateTrie, null, { activatePrecompiles: true });
this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511') this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511');
this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c') this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c');
} else { } else {
var host = options.host || "localhost"; var host = options.host || "localhost";
var port = options.port || "8545"; var port = options.port || "8545";
@ -35,7 +35,7 @@ function UniversalDApp (contracts, options) {
UniversalDApp.prototype.addAccount = function (privateKey, balance) { UniversalDApp.prototype.addAccount = function (privateKey, balance) {
if (this.accounts) { if (this.accounts) {
privateKey = new Buffer(privateKey, 'hex') privateKey = new Buffer(privateKey, 'hex');
var address = ethJSUtil.privateToAddress(privateKey); var address = ethJSUtil.privateToAddress(privateKey);
// FIXME: we don't care about the callback, but we should still make this proper // FIXME: we don't care about the callback, but we should still make this proper
@ -92,7 +92,7 @@ UniversalDApp.prototype.render = function () {
} else { } else {
var $title = $('<span class="title"/>').text( this.contracts[c].name ); var $title = $('<span class="title"/>').text( this.contracts[c].name );
if (this.contracts[c].bytecode) { if (this.contracts[c].bytecode) {
$title.append($('<div class="size"/>').text((this.contracts[c].bytecode.length / 2) + ' bytes')) $title.append($('<div class="size"/>').text((this.contracts[c].bytecode.length / 2) + ' bytes'));
} }
$contractEl.append( $title ).append( this.getCreateInterface( $contractEl, this.contracts[c]) ); $contractEl.append( $title ).append( this.getCreateInterface( $contractEl, this.contracts[c]) );
} }
@ -102,14 +102,14 @@ UniversalDApp.prototype.render = function () {
$legend = $('<div class="legend" />') $legend = $('<div class="legend" />')
.append( $('<div class="attach"/>').text('Attach') ) .append( $('<div class="attach"/>').text('Attach') )
.append( $('<div class="transact"/>').text('Transact') ) .append( $('<div class="transact"/>').text('Transact') )
.append( $('<div class="call"/>').text('Call') ) .append( $('<div class="call"/>').text('Call') );
this.$el.append( $('<div class="poweredBy" />') this.$el.append( $('<div class="poweredBy" />')
.html("<a href='http://github.com/d11e9/universal-dapp'>Universal ÐApp</a> powered by The Blockchain") ) .html("<a href='http://github.com/d11e9/universal-dapp'>Universal ÐApp</a> powered by The Blockchain") );
this.$el.append( $legend ) this.$el.append( $legend );
return this.$el; return this.$el;
} };
UniversalDApp.prototype.getContractByName = function(contractName) { UniversalDApp.prototype.getContractByName = function(contractName) {
for (var c in this.contracts) for (var c in this.contracts)
@ -121,8 +121,8 @@ UniversalDApp.prototype.getContractByName = function(contractName) {
UniversalDApp.prototype.getABIInputForm = function (cb){ UniversalDApp.prototype.getABIInputForm = function (cb){
var self = this; var self = this;
var $el = $('<div class="udapp-setup" />'); var $el = $('<div class="udapp-setup" />');
var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>') var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>');
var $createButton = $('<button class="udapp-create"/>').text('Create a Universal ÐApp') var $createButton = $('<button class="udapp-create"/>').text('Create a Universal ÐApp');
$createButton.click(function(ev){ $createButton.click(function(ev){
var contracts = $.parseJSON( $jsonInput.val() ); var contracts = $.parseJSON( $jsonInput.val() );
if (cb) { if (cb) {
@ -133,30 +133,30 @@ UniversalDApp.prototype.getABIInputForm = function (cb){
} catch(e) { } catch(e) {
err = e; err = e;
} }
cb( err, dapp ) cb( err, dapp );
} else { } else {
self.contracts = contracts; 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; return $el;
} };
UniversalDApp.prototype.getCreateInterface = function ($container, contract) { UniversalDApp.prototype.getCreateInterface = function ($container, contract) {
var self = this; var self = this;
var $createInterface = $('<div class="create"/>'); var $createInterface = $('<div class="create"/>');
if (this.options.removable) { if (this.options.removable) {
var $close = $('<div class="udapp-close" />') var $close = $('<div class="udapp-close" />');
$close.click( function(){ self.$el.remove(); } ) $close.click( function(){ self.$el.remove(); } );
$createInterface.append( $close ); $createInterface.append( $close );
} }
var $newButton = this.getInstanceInterface( contract ) var $newButton = this.getInstanceInterface( contract );
var $atButton = $('<button class="atAddress"/>').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ) } ); var $atButton = $('<button class="atAddress"/>').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ); } );
$createInterface.append( $atButton ).append( $newButton ); $createInterface.append( $atButton ).append( $newButton );
return $createInterface; return $createInterface;
} };
UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) { UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) {
var self = this; var self = this;
@ -175,8 +175,8 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
var $instance = $('<div class="instance"/>'); var $instance = $('<div class="instance"/>');
if (self.options.removable_instances) { if (self.options.removable_instances) {
var $close = $('<div class="udapp-close" />') var $close = $('<div class="udapp-close" />');
$close.click( function(){ $instance.remove(); } ) $close.click( function(){ $instance.remove(); } );
$instance.append( $close ); $instance.append( $close );
} }
var context = self.options.vm ? 'memory' : 'blockchain'; var context = self.options.vm ? 'memory' : 'blockchain';
@ -188,17 +188,17 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
$events = $('<div class="events"/>'); $events = $('<div class="events"/>');
var parseLogs = function(err,response) { var parseLogs = function(err,response) {
$event = $('<div class="event" />') $event = $('<div class="event" />');
var $close = $('<div class="udapp-close" />') var $close = $('<div class="udapp-close" />');
$close.click( function(){ $event.remove(); } ) $close.click( function(){ $event.remove(); } );
$event.append( $('<span class="name"/>').text(response.event) ) $event.append( $('<span class="name"/>').text(response.event) )
.append( $('<span class="args" />').text( JSON.stringify(response.args, null, 2) ) ) .append( $('<span class="args" />').text( JSON.stringify(response.args, null, 2) ) )
.append( $close ); .append( $close );
$events.append( $event ); $events.append( $event );
} };
if (self.options.vm){ if (self.options.vm){
// FIXME: support indexed events // FIXME: support indexed events
@ -207,7 +207,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
$.each(abi, function(i, funABI) { $.each(abi, function(i, funABI) {
if (funABI.type !== 'event') return; 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 }; eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs };
}); });
@ -224,7 +224,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
return item.type; return item.type;
}); });
decoded = ethJSABI.rawDecode(types, log[2]); decoded = ethJSABI.rawDecode(types, log[2]);
decoded = ethJSABI.stringify(types, decoded) decoded = ethJSABI.stringify(types, decoded);
} catch (e) { } catch (e) {
decoded = '0x' + log[2].toString('hex'); decoded = '0x' + log[2].toString('hex');
} }
@ -260,7 +260,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
})); }));
}); });
($el || $createInterface ).append( $instance.append( $events ) ); ($el || $createInterface ).append( $instance.append( $events ) );
} };
if (!address || !$target) { if (!address || !$target) {
$createInterface.append( this.getCallButton({ $createInterface.append( this.getCallButton({
@ -278,7 +278,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
} }
return $createInterface; return $createInterface;
} };
UniversalDApp.prototype.getConstructorInterface = function(abi) { UniversalDApp.prototype.getConstructorInterface = function(abi) {
var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]}; var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]};
@ -288,7 +288,7 @@ UniversalDApp.prototype.getConstructorInterface = function(abi) {
break; break;
} }
return funABI; return funABI;
} };
UniversalDApp.prototype.getCallButton = function(args) { UniversalDApp.prototype.getCallButton = function(args) {
var self = this; var self = this;
@ -309,18 +309,18 @@ UniversalDApp.prototype.getCallButton = function(args) {
var getReturnOutput = function(result) { var getReturnOutput = function(result) {
var returnName = lookupOnly ? 'Value' : 'Result'; var returnName = lookupOnly ? 'Value' : 'Result';
var returnCls = lookupOnly ? 'value' : 'returned'; var returnCls = lookupOnly ? 'value' : 'returned';
return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify( result, null, 2 ) ) return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify( result, null, 2 ) );
} };
var getGasUsedOutput = function (result) { var getGasUsedOutput = function (result) {
var $gasUsed = $('<div class="gasUsed">') var $gasUsed = $('<div class="gasUsed">');
var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : ''; var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : '';
if (result.gasUsed) { if (result.gasUsed) {
var gas = result.gasUsed.toString(10) var gas = result.gasUsed.toString(10);
$gasUsed.html('<strong>Cost:</strong> ' + gas + ' gas. ' + caveat ) $gasUsed.html('<strong>Cost:</strong> ' + gas + ' gas. ' + caveat );
} }
return $gasUsed; return $gasUsed;
} };
var getDecodedOutput = function (result) { var getDecodedOutput = function (result) {
var $decoded; var $decoded;
@ -333,7 +333,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
$decoded = result; $decoded = result;
} }
return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded); return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded);
} };
var getOutput = function() { var getOutput = function() {
var $result = $('<div class="result" />'); var $result = $('<div class="result" />');
@ -451,7 +451,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
function testResult (err, address) { function testResult (err, address) {
if (!err && !address) { if (!err && !address) {
setTimeout( function(){ tryTillResponse(txhash, done) }, 500); setTimeout( function(){ tryTillResponse(txhash, done); }, 500);
} else done( err, address ); } else done( err, address );
} }
@ -465,11 +465,11 @@ UniversalDApp.prototype.getCallButton = function(args) {
clearOutput($result); clearOutput($result);
$result.append(getReturnOutput(result)).append(getGasUsedOutput(result)); $result.append(getReturnOutput(result)).append(getGasUsedOutput(result));
} }
}) });
} }
}); });
} };
var button = $('<button />') var button = $('<button />')
.addClass( 'call' ) .addClass( 'call' )
@ -489,7 +489,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
.append(button) .append(button)
.append( (lookupOnly && !inputs.length) ? $outputOverride : inputField ); .append( (lookupOnly && !inputs.length) ? $outputOverride : inputField );
return $contractProperty.append(outputSpan); return $contractProperty.append(outputSpan);
} };
UniversalDApp.prototype.linkBytecode = function(contractName, cb) { UniversalDApp.prototype.linkBytecode = function(contractName, cb) {
var bytecode = this.getContractByName(contractName).bytecode; var bytecode = this.getContractByName(contractName).bytecode;
@ -536,12 +536,12 @@ UniversalDApp.prototype.deployLibrary = function(contractName, cb) {
UniversalDApp.prototype.clickNewContract = function ( self, $contract, contract ) { UniversalDApp.prototype.clickNewContract = function ( self, $contract, contract ) {
$contract.append( self.getInstanceInterface(contract) ); $contract.append( self.getInstanceInterface(contract) );
} };
UniversalDApp.prototype.clickContractAt = function ( self, $output, contract ) { UniversalDApp.prototype.clickContractAt = function ( self, $output, contract ) {
var address = prompt( "What Address is this contract at in the Blockchain? ie: '0xdeadbeaf...'" ) var address = prompt( "What Address is this contract at in the Blockchain? ie: '0xdeadbeaf...'" );
self.getInstanceInterface(contract, address, $output ); self.getInstanceInterface(contract, address, $output );
} };
UniversalDApp.prototype.runTx = function( data, args, cb) { UniversalDApp.prototype.runTx = function( data, args, cb) {
var self = this; var self = this;
@ -605,6 +605,6 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
cb( e, null ); cb( e, null );
} }
} }
} };
module.exports = UniversalDApp; module.exports = UniversalDApp;

Write Preview
Loading…
Cancel
Save