Skip to content

Commit

Permalink
Made formatting consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Denton-L committed May 24, 2016
1 parent b47aa35 commit b994ba7
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 65 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ loaded via http. If you clone/download the repository, use the

Many dependencies are only provided via npm:

npm install # fetch dependencies
npm install # fetch dependencies
npm run build # build application into build/app.js

Now point your browser to `index.html` to open the application.
Now point your browser to `index.html` to open the application.

## Usage as a Chrome Extension

Expand Down
28 changes: 14 additions & 14 deletions assets/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ code, pre {

pre {
padding:8px 15px;
background: #f8f8f8;
background: #f8f8f8;
border-radius:5px;
border:1px solid #e5e5e5;
overflow-x: auto;
Expand Down Expand Up @@ -110,17 +110,17 @@ header {
header ul {
list-style:none;
height:40px;

padding:0;

background: #eee;
background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dddddd));
background: -webkit-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: -o-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: -ms-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: linear-gradient(top, #f8f8f8 0%,#dddddd 100%);

border-radius:5px;
border:1px solid #d2d2d2;
box-shadow:inset #fff 0 1px 0, inset rgba(0,0,0,0.03) 0 -1px 0;
Expand Down Expand Up @@ -214,33 +214,33 @@ footer {
}

@media print, screen and (max-width: 960px) {

div.wrapper {
width:auto;
margin:0;
}

header, section, footer {
float:none;
position:static;
width:auto;
}

header {
padding-right:320px;
}

section {
border:1px solid #e5e5e5;
border-width:1px 0;
padding:20px 0;
margin:0 0 20px;
}

header a small {
display:inline;
}

header ul {
position:absolute;
right:50px;
Expand All @@ -252,15 +252,15 @@ footer {
body {
word-wrap:break-word;
}

header {
padding:0;
}

header ul, header p.view {
position:static;
}

pre, code {
word-wrap:normal;
}
Expand All @@ -270,7 +270,7 @@ footer {
body {
padding:15px;
}

header ul {
display:none;
}
Expand Down
2 changes: 1 addition & 1 deletion background.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ chrome.browserAction.onClicked.addListener(function(tab) {


chrome.tabs.create({'url': chrome.extension.getURL('index.html')}, function(tab) {
// tab opened
// tab opened
});

});
10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

</head>
<body>


<div id="editor">
<span class="newFile" title="New File"><i class="fa fa-file-code-o"></i></span>
Expand Down Expand Up @@ -107,20 +107,20 @@
<label for="web3">
<input id="web3" type="radio" value="web3" name="executionContext">
<strong>Web3 Provider</strong>
<p>Execution environment connects to node at localhost (or via IPC if available), transactions will be sent to the network and can cause loss of money or worse!<br/>
<b>If this page is served via https and you access your node via http, it might not work. In this case, try cloning the repository and serving it via http.</b></p>
<p>Execution environment connects to node at localhost (or via IPC if available), transactions will be sent to the network and can cause loss of money or worse!<br/>
<b>If this page is served via https and you access your node via http, it might not work. In this case, try cloning the repository and serving it via http.</b></p>
<label for="web3Endpoint">
<strong>Web3 Provider Endpoint</strong>: <input type="text" id="web3Endpoint" value="http://localhost:8545">
</label>
</label>
</span>
</div>

</div>
</div>
<div id="output"></div>
</div>

<script src="build/app.js"></script>
</body>
</html>
40 changes: 20 additions & 20 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ var run = function() {
var untitledCount = '';
if (!getFiles().length || window.localStorage['sol-cache']) {
if(loadingFromGist) return;
// Backwards-compatibility
// Backwards-compatibility
while (window.localStorage[SOL_CACHE_UNTITLED + untitledCount])
untitledCount = (untitledCount - 0) + 1;
SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
Expand Down Expand Up @@ -262,7 +262,7 @@ var run = function() {


// ------------------ gist publish --------------

var packageFiles = function() {
var files = {};
var filesArr = getFiles();
Expand All @@ -272,7 +272,7 @@ var run = function() {
content: localStorage[filesArr[f]]
};
}
return files;
return files;
};

$('#gist').click(function(){
Expand All @@ -281,7 +281,7 @@ var run = function() {
var files = packageFiles();
var description = "Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=" + getQueryParams().version + "&optimize="+ getQueryParams().optimize +"&gist=";

$.ajax({
$.ajax({
url: 'https://api.github.com/gists',
type: 'POST',
data: JSON.stringify({
Expand Down Expand Up @@ -397,7 +397,7 @@ var run = function() {
for (var f in files) {
$filesEl.append(fileTabTemplate(files[f]));
}

if (SOL_CACHE_FILE) {
var active = fileTabFromKey(SOL_CACHE_FILE);
active.addClass('active');
Expand Down Expand Up @@ -511,9 +511,9 @@ var run = function() {
updateQueryParams({version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val());
});

// ----------------- resizeable ui ---------------

var EDITOR_SIZE_CACHE_KEY = "editor-size-cache";
var dragging = false;
$('#dragbar').mousedown(function(e){
Expand Down Expand Up @@ -566,13 +566,13 @@ var run = function() {

var hidingRHP = false;
$('.toggleRHP').click(function(){
hidingRHP = !hidingRHP;
setEditorSize( hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY] );
$('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
$('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
if (!hidingRHP) compile();
hidingRHP = !hidingRHP;
setEditorSize( hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY] );
$('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
$('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
if (!hidingRHP) compile();
});


// ----------------- editor resize ---------------

Expand All @@ -595,7 +595,7 @@ var run = function() {

document.querySelector('#editor').addEventListener('change', onResize);
document.querySelector('#editorWrap').addEventListener('change', onResize);


// ----------------- compiler ----------------------
var compileJSON;
Expand Down Expand Up @@ -637,13 +637,13 @@ var run = function() {
if (errortype(err) !== 'warning') noFatalErrors = false;
});
}

if (missingInputs !== undefined && missingInputs.length > 0)
compile(missingInputs);
else if (noFatalErrors && !hidingRHP)
renderContracts(data, editor.getValue());
};

var compileTimeout = null;
var onChange = function() {
var input = editor.getValue();
Expand Down Expand Up @@ -860,18 +860,18 @@ var run = function() {

code += "var " + contractName + "Contract = web3.eth.contract(" + interface.replace("\n","") + ");"
+"\nvar " + contractName + " = " + contractName + "Contract.new(";

$.each(funABI.inputs, function(i, inp) {
code += "\n " + inp.name + ",";
});

code += "\n {"+
"\n from: web3.eth.accounts[0], "+
"\n data: '"+bytecode+"', "+
"\n gas: 3000000"+
"\n }, function(e, contract){"+
"\n console.log(e, contract);"+
"\n if (typeof contract.address != 'undefined') {"+
"\n if (typeof contract.address != 'undefined') {"+
"\n console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash);" +
"\n }" +
"\n })";
Expand Down Expand Up @@ -1010,7 +1010,7 @@ var run = function() {

return text;
};

$('.asmOutput button').click(function() {$(this).parent().find('pre').toggle(); });

var getConstructorInterface = function(abi) {
Expand Down
26 changes: 13 additions & 13 deletions src/mode-solidity.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var DocCommentHighlightRules = function() {
"start" : [ {
token : "comment.doc.tag",
regex : "@[\\w\\d_]+" // TODO: fix email addresses
},
},
DocCommentHighlightRules.getTagRule(),
{
defaultToken : "comment.doc",
Expand Down Expand Up @@ -341,8 +341,8 @@ var JavaScriptHighlightRules = function(options) {
}
]
};


if (!options || !options.noES6) {
this.$rules.no_regex.unshift({
regex: "[{}]", onMatch: function(val, state, stack) {
Expand Down Expand Up @@ -379,10 +379,10 @@ var JavaScriptHighlightRules = function(options) {
}]
});
}

this.embedRules(DocCommentHighlightRules, "doc-",
[ DocCommentHighlightRules.getEndRule("no_regex") ]);

this.normalizeRules();
};

Expand Down Expand Up @@ -717,7 +717,7 @@ var CstyleBehaviour = function() {

};


CstyleBehaviour.isSaneInsertion = function(editor, session) {
var cursor = editor.getCursorPosition();
var iterator = new TokenIterator(session, cursor.row, cursor.column);
Expand Down Expand Up @@ -821,16 +821,16 @@ oop.inherits(FoldMode, BaseFoldMode);

if (match[1])
return this.openingBracketBlock(session, match[1], row, i);

var range = session.getCommentFoldRange(row, i + match[0].length, 1);

if (range && !range.isMultiLine()) {
if (forceMultiline) {
range = this.getSectionRange(session, row);
} else if (foldStyle != "all")
range = null;
}

return range;
}

Expand All @@ -847,7 +847,7 @@ oop.inherits(FoldMode, BaseFoldMode);
return session.getCommentFoldRange(row, i, -1);
}
};

this.getSectionRange = function(session, row) {
var line = session.getLine(row);
var startIndent = line.search(/\S/);
Expand All @@ -864,7 +864,7 @@ oop.inherits(FoldMode, BaseFoldMode);
if (startIndent > indent)
break;
var subRange = this.getFoldWidgetRange(session, "all", row);

if (subRange) {
if (subRange.start.row <= startRow) {
break;
Expand All @@ -876,7 +876,7 @@ oop.inherits(FoldMode, BaseFoldMode);
}
endRow = row;
}

return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
};

Expand All @@ -898,7 +898,7 @@ var CStyleFoldMode = acequire("./folding/cstyle").FoldMode;

var Mode = function() {
this.HighlightRules = JavaScriptHighlightRules;

this.$outdent = new MatchingBraceOutdent();
this.$behaviour = new CstyleBehaviour();
this.foldingRules = new CStyleFoldMode();
Expand Down
Loading

0 comments on commit b994ba7

Please sign in to comment.