Skip to content

B
baas-ide
Commit 1bf2dae9 authored by chriseth's avatar chriseth
Browse files
Options

Merge pull request #34 from ethereum/patch/use-js-standard

Use better JS source formatting [WIP]
parents 7ab935fe 1eca2fa1
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 79 deletions
src/app.js
View file @ 1bf2dae9
......@@ -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);
......@@ -332,7 +332,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);
......@@ -368,7 +368,7 @@ var run = function() {
}
return false;
})
});
$filesEl.on('click', '.file .remove', function(ev) {
ev.preventDefault();
......@@ -453,19 +453,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');
......@@ -489,14 +489,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();
});
......@@ -777,7 +777,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); });
......@@ -817,7 +817,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 });
......@@ -868,15 +868,15 @@ var run = function() {
}
};
var gethDeploy = function(contractName, interface, bytecode){
var gethDeploy = function(contractName, jsonInterface, bytecode){
var code = "";
var funABI = getConstructorInterface($.parseJSON(interface));
var funABI = getConstructorInterface($.parseJSON(jsonInterface));
$.each(funABI.inputs, function(i, inp) {
code += "var " + inp.name + " = /* var of type " + inp.type + " here */ ;\n";
});
code += "var " + contractName + "Contract = web3.eth.contract(" + interface.replace("\n","") + ");"
code += "var " + contractName + "Contract = web3.eth.contract(" + jsonInterface.replace("\n","") + ");"
+"\nvar " + contractName + " = " + contractName + "Contract.new(";
$.each(funABI.inputs, function(i, inp) {
......@@ -898,8 +898,8 @@ var run = function() {
return code;
};
var combined = function(contractName, interface, bytecode){
return JSON.stringify([{name: contractName, interface: interface, bytecode: bytecode}]);
var combined = function(contractName, jsonInterface, bytecode){
return JSON.stringify([{name: contractName, interface: jsonInterface, bytecode: bytecode}]);
};
var renderContracts = function(data, source) {
......@@ -992,7 +992,7 @@ var run = function() {
return $('<div class="contractDetails"/>').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';
......@@ -1041,7 +1041,7 @@ var run = function() {
return funABI;
};
syncStorage()
syncStorage();
};
......
src/mode-solidity.js
View file @ 1bf2dae9
......@@ -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 {
......
src/universal-dapp.js
View file @ 1bf2dae9
......@@ -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 = $('<span class="title"/>').text( this.contracts[c].name );
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]) );
}
......@@ -102,14 +102,14 @@ UniversalDApp.prototype.render = function () {
$legend = $('<div class="legend" />')
.append( $('<div class="attach"/>').text('Attach') )
.append( $('<div class="transact"/>').text('Transact') )
.append( $('<div class="call"/>').text('Call') )
.append( $('<div class="call"/>').text('Call') );
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;
}
};
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 = $('<div class="udapp-setup" />');
var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>')
var $createButton = $('<button class="udapp-create"/>').text('Create a Universal ÐApp')
var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>');
var $createButton = $('<button class="udapp-create"/>').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 = $('<div class="create"/>');
if (this.options.removable) {
var $close = $('<div class="udapp-close" />')
$close.click( function(){ self.$el.remove(); } )
var $close = $('<div class="udapp-close" />');
$close.click( function(){ self.$el.remove(); } );
$createInterface.append( $close );
}
var $newButton = this.getInstanceInterface( contract )
var $atButton = $('<button class="atAddress"/>').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ) } );
var $newButton = this.getInstanceInterface( contract );
var $atButton = $('<button class="atAddress"/>').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 = $('<div class="instance"/>');
if (self.options.removable_instances) {
var $close = $('<div class="udapp-close" />')
$close.click( function(){ $instance.remove(); } )
var $close = $('<div class="udapp-close" />');
$close.click( function(){ $instance.remove(); } );
$instance.append( $close );
}
var context = self.options.vm ? 'memory' : 'blockchain';
......@@ -188,17 +188,20 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
$events = $('<div class="events"/>');
var parseLogs = function(err,response) {
$event = $('<div class="event" />')
if (err)
return;
$event = $('<div class="event" />');
var $close = $('<div class="udapp-close" />')
$close.click( function(){ $event.remove(); } )
var $close = $('<div class="udapp-close" />');
$close.click( function(){ $event.remove(); } );
$event.append( $('<span class="name"/>').text(response.event) )
.append( $('<span class="args" />').text( JSON.stringify(response.args, null, 2) ) )
.append( $close );
$events.append( $event );
}
};
if (self.options.vm){
// FIXME: support indexed events
......@@ -207,7 +210,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 +227,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 +263,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
}));
});
($el || $createInterface ).append( $instance.append( $events ) );
}
};
if (!address || !$target) {
$createInterface.append( this.getCallButton({
......@@ -278,7 +281,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
}
return $createInterface;
}
};
UniversalDApp.prototype.getConstructorInterface = function(abi) {
var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]};
......@@ -288,7 +291,7 @@ UniversalDApp.prototype.getConstructorInterface = function(abi) {
break;
}
return funABI;
}
};
UniversalDApp.prototype.getCallButton = function(args) {
var self = this;
......@@ -309,18 +312,18 @@ UniversalDApp.prototype.getCallButton = function(args) {
var getReturnOutput = function(result) {
var returnName = lookupOnly ? 'Value' : 'Result';
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 $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>' : '';
if (result.gasUsed) {
var gas = result.gasUsed.toString(10)
$gasUsed.html('<strong>Cost:</strong> ' + gas + ' gas. ' + caveat )
var gas = result.gasUsed.toString(10);
$gasUsed.html('<strong>Cost:</strong> ' + gas + ' gas. ' + caveat );
}
return $gasUsed;
}
};
var getDecodedOutput = function (result) {
var $decoded;
......@@ -333,7 +336,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
$decoded = result;
}
return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded);
}
};
var getOutput = function() {
var $result = $('<div class="result" />');
......@@ -451,7 +454,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
function testResult (err, address) {
if (!err && !address) {
setTimeout( function(){ tryTillResponse(txhash, done) }, 500);
setTimeout( function(){ tryTillResponse(txhash, done); }, 500);
} else done( err, address );
}
......@@ -465,11 +468,11 @@ UniversalDApp.prototype.getCallButton = function(args) {
clearOutput($result);
$result.append(getReturnOutput(result)).append(getGasUsedOutput(result));
}
})
});
}
});
}
};
var button = $('<button />')
.addClass( 'call' )
......@@ -489,7 +492,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
.append(button)
.append( (lookupOnly && !inputs.length) ? $outputOverride : inputField );
return $contractProperty.append(outputSpan);
}
};
UniversalDApp.prototype.linkBytecode = function(contractName, cb) {
var bytecode = this.getContractByName(contractName).bytecode;
......@@ -536,12 +539,12 @@ UniversalDApp.prototype.deployLibrary = function(contractName, cb) {
UniversalDApp.prototype.clickNewContract = function ( self, $contract, contract ) {
$contract.append( self.getInstanceInterface(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 );
}
};
UniversalDApp.prototype.runTx = function( data, args, cb) {
var self = this;
......@@ -605,6 +608,6 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
cb( e, null );
}
}
}
};
module.exports = UniversalDApp;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment