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

Merge pull request #68 from ethereum/codestyle-formatting

Browse Source 
Codestyle formatting (Part 1)
pull/1/head
Alex Beregszaszi 9 years ago
parent e382840fb3 504e6d7837
commit 09690338a6
13 changed files with 1075 additions and 1084 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. 4
      assets/js/ballot.sol.js
  2. 11
      background.js
  3. 869
      src/app.js
  4. 75
      src/app/compiler-worker.js
  5. 28
      src/app/compiler.js
  6. 2
      src/app/editor.js
  7. 2
      src/app/execution-context.js
  8. 2
      src/app/gist-handler.js
  9. 4
      src/app/query-params.js
  10. 33
      src/app/renderer.js
  11. 11
      src/app/storage-handler.js
  12. 2
      src/index.js
  13. 1116
      src/universal-dapp.js

4
assets/js/ballot.sol.js
Unescape View File

@ -22,9 +22,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
var multi = function(func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; } var multi = function (func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; };
var BALLOT_EXAMPLE = multi(function(){/*contract Ballot { var BALLOT_EXAMPLE = multi(function () { /*contract Ballot {
struct Voter { struct Voter {
uint weight; uint weight;

11
background.js
Unescape View File

@ -1,10 +1,9 @@
chrome.browserAction.onClicked.addListener(function (tab) { /* global chrome */
chrome.storage.sync.set({ 'chrome-app-sync' : true });
chrome.browserAction.onClicked.addListener(function (tab) {
chrome.storage.sync.set({ 'chrome-app-sync': true });
chrome.tabs.create({ 'url': chrome.extension.getURL('index.html') }, function (tab) { chrome.tabs.create({ 'url': chrome.extension.getURL('index.html') }, function (tab) {
// tab opened // tab opened
}); });
}); });

869
src/app.js
Unescape View File

@ -1,3 +1,5 @@
/* global alert, confirm, prompt, Option, Worker, soljsonSources */
var $ = require('jquery'); var $ = require('jquery');
var utils = require('./app/utils'); var utils = require('./app/utils');
@ -13,452 +15,441 @@ var Compiler = require('./app/compiler');
var filesToLoad = null; var filesToLoad = null;
var loadFilesCallback = function (files) { filesToLoad = files; }; // will be replaced later var loadFilesCallback = function (files) { filesToLoad = files; }; // will be replaced later
window.addEventListener('message', function (ev) { window.addEventListener('message', function (ev) {
if (typeof ev.data === typeof [] && ev.data[0] === 'loadFiles') { if (typeof ev.data === typeof [] && ev.data[0] === 'loadFiles') {
loadFilesCallback(ev.data[1]); loadFilesCallback(ev.data[1]);
} }
}, false); }, false);
var run = function () { var run = function () {
function loadFiles (files) {
function loadFiles (files) { for (var f in files) {
for (var f in files) { var key = utils.fileKey(f);
var key = utils.fileKey(f); var content = files[f].content;
var content = files[f].content; if (key in window.localStorage && window.localStorage[key] !== content) {
if (key in window.localStorage && window.localStorage[key] !== content) { var count = '';
var count = ''; while ((key + count) in window.localStorage) count = count - 1;
var otherKey = key + count; window.localStorage[key + count] = window.localStorage[key];
while ((key + count) in window.localStorage) count = count - 1; }
window.localStorage[key + count] = window.localStorage[key]; window.localStorage[key] = content;
} }
window.localStorage[key] = content; editor.setCacheFile(Object.keys(files)[0]);
} updateFiles();
editor.setCacheFile(Object.keys(files)[0]); }
updateFiles();
} loadFilesCallback = function (files) {
loadFiles(files);
loadFilesCallback = function (files) { };
loadFiles(files);
}; if (filesToLoad !== null) {
loadFiles(filesToLoad);
if (filesToLoad !== null) { }
loadFiles(filesToLoad);
// ------------------ query params (hash) ----------------
function syncQueryParams () {
$('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
}
window.onhashchange = syncQueryParams;
syncQueryParams();
// -------- check file upload capabilities -------
if (!(window.File || window.FileReader || window.FileList || window.Blob)) {
$('.uploadFile').remove();
}
// ------------------ gist load ----------------
var loadingFromGist = gistHandler.handleLoad(function (gistId) {
$.ajax({
url: 'https://api.github.com/gists/' + gistId,
jsonp: 'callback',
dataType: 'jsonp',
success: function (response) {
if (response.data) {
if (!response.data.files) {
alert('Gist load error: ' + response.data.message);
return;
}
loadFiles(response.data.files);
} }
}
});
// ------------------ query params (hash) ---------------- });
function syncQueryParams () { // ----------------- storage --------------------
$('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
} var storageHandler = new StorageHandler(updateFiles);
window.syncStorage = storageHandler.sync;
window.onhashchange = syncQueryParams; storageHandler.sync();
syncQueryParams();
// ----------------- editor ----------------------
// -------- check file upload capabilities -------
if (!(window.File || window.FileReader || window.FileList || window.Blob)) { var editor = new Editor(loadingFromGist);
$(".uploadFile").remove();
} // ----------------- tabbed menu -------------------
// ------------------ gist load ---------------- $('#options li').click(function (ev) {
var $el = $(this);
var loadingFromGist = gistHandler.handleLoad(function (gistId) { var match = /[a-z]+View/.exec($el.get(0).className);
$.ajax({ if (!match) return;
url: 'https://api.github.com/gists/' + gistId, var cls = match[0];
jsonp: 'callback', if (!$el.hasClass('active')) {
dataType: 'jsonp', $el.parent().find('li').removeClass('active');
success: function (response) { $('#optionViews').attr('class', '').addClass(cls);
if (response.data) { $el.addClass('active');
if (!response.data.files) { } else {
alert('Gist load error: ' + response.data.message); $el.removeClass('active');
return; $('#optionViews').removeClass(cls);
} }
loadFiles(response.data.files); });
}
} // ------------------ gist publish --------------
$('#gist').click(function () {
if (confirm('Are you sure you want to publish all your files anonymously as a public gist on github.com?')) {
var files = editor.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=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=';
$.ajax({
url: 'https://api.github.com/gists',
type: 'POST',
data: JSON.stringify({
description: description,
public: true,
files: files
})
}).done(function (response) {
if (response.html_url && confirm('Created a gist at ' + response.html_url + ' Would you like to open it in a new window?')) {
window.open(response.html_url, '_blank');
}
});
}
});
$('#copyOver').click(function () {
var target = prompt(
'To which other browser-solidity instance do you want to copy over all files?',
'https://ethereum.github.io/browser-solidity/'
);
if (target === null) {
return;
}
var files = editor.packageFiles();
$('<iframe/>', {src: target, style: 'display:none;', load: function () {
this.contentWindow.postMessage(['loadFiles', files], '*');
}}).appendTo('body');
});
// ----------------- file selector-------------
var $filesEl = $('#files');
var FILE_SCROLL_DELTA = 300;
$('.newFile').on('click', function () {
editor.newFile();
updateFiles();
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
reAdjust();
}); });
}); });
// ----------------- file upload -------------
// ----------------- storage --------------------
$('.inputFile').on('change', function () {
var storageHandler = new StorageHandler(updateFiles); var fileList = $('input.inputFile')[0].files;
window.syncStorage = storageHandler.sync; for (var i = 0; i < fileList.length; i++) {
storageHandler.sync(); var name = fileList[i].name;
if (!window.localStorage[utils.fileKey(name)] || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) {
editor.uploadFile(fileList[i]);
// ----------------- editor ---------------------- updateFiles();
}
var editor = new Editor(loadingFromGist); }
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
// ----------------- tabbed menu ------------------- reAdjust();
});
$('#options li').click(function (ev) { });
var $el = $(this);
var match = /[a-z]+View/.exec($el.get(0).className); $filesEl.on('click', '.file:not(.active)', showFileHandler);
if (!match) return;
var cls = match[0]; $filesEl.on('click', '.file.active', function (ev) {
if (!$el.hasClass('active')) { var $fileTabEl = $(this);
$el.parent().find('li').removeClass('active'); var originalName = $fileTabEl.find('.name').text();
$('#optionViews').attr('class', '').addClass(cls); ev.preventDefault();
$el.addClass('active'); if ($(this).find('input').length > 0) return false;
} else { var $fileNameInputEl = $('<input value="' + originalName + '"/>');
$el.removeClass('active'); $fileTabEl.html($fileNameInputEl);
$('#optionViews').removeClass(cls); $fileNameInputEl.focus();
} $fileNameInputEl.select();
}); $fileNameInputEl.on('blur', handleRename);
$fileNameInputEl.keyup(handleRename);
// ------------------ gist publish -------------- function handleRename (ev) {
ev.preventDefault();
$('#gist').click(function () { if (ev.which && ev.which !== 13) return false;
if (confirm('Are you sure you want to publish all your files anonymously as a public gist on github.com?')) { var newName = ev.target.value;
$fileNameInputEl.off('blur');
var files = editor.packageFiles(); $fileNameInputEl.off('keyup');
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=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=';
if (newName !== originalName && confirm('Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
$.ajax({ var content = window.localStorage.getItem(utils.fileKey(originalName));
url: 'https://api.github.com/gists', window.localStorage[utils.fileKey(newName)] = content;
type: 'POST', window.localStorage.removeItem(utils.fileKey(originalName));
data: JSON.stringify({ editor.setCacheFile(newName);
description: description, }
public: true,
files: files updateFiles();
}) return false;
}).done(function (response) { }
if (response.html_url && confirm('Created a gist at ' + response.html_url + ' Would you like to open it in a new window?')) {
window.open(response.html_url, '_blank'); return false;
} });
});
} $filesEl.on('click', '.file .remove', function (ev) {
}); ev.preventDefault();
var name = $(this).parent().find('.name').text();
$('#copyOver').click(function () {
var target = prompt( if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) {
'To which other browser-solidity instance do you want to copy over all files?', window.localStorage.removeItem(utils.fileKey(name));
'https://ethereum.github.io/browser-solidity/' editor.setNextFile(utils.fileKey(name));
); updateFiles();
if (target === null) { }
return; return false;
} });
var files = editor.packageFiles();
var iframe = $('<iframe/>', {src: target, style: 'display:none;', load: function () { function showFileHandler (ev) {
this.contentWindow.postMessage(['loadFiles', files], '*'); ev.preventDefault();
}}).appendTo('body'); editor.setCacheFile($(this).find('.name').text());
}); updateFiles();
return false;
// ----------------- file selector------------- }
var $filesEl = $('#files'); function activeFileTab () {
var FILE_SCROLL_DELTA = 300; var name = editor.getCacheFile();
return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
$('.newFile').on('click', function () { }
editor.newFile();
updateFiles(); function updateFiles () {
var $filesEl = $('#files');
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () { var files = editor.getFiles();
reAdjust();
}); $filesEl.find('.file').remove();
});
for (var f in files) {
// ----------------- file upload ------------- $filesEl.append(fileTabTemplate(files[f]));
}
$('.inputFile').on('change', function () {
var fileList = $('input.inputFile')[0].files; if (editor.cacheFileIsPresent()) {
for (var i = 0; i < fileList.length; i++) { var active = activeFileTab();
var name = fileList[i].name; active.addClass('active');
if (!window.localStorage[utils.fileKey(name)] || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) { editor.resetSession();
editor.uploadFile(fileList[i]); }
updateFiles(); $('#input').toggle(editor.cacheFileIsPresent());
} $('#output').toggle(editor.cacheFileIsPresent());
} reAdjust();
}
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
reAdjust(); function fileTabTemplate (key) {
}); var name = utils.fileNameFromKey(key);
}); return $('<li class="file"><span class="name">' + name + '</span><span class="remove"><i class="fa fa-close"></i></span></li>');
}
$filesEl.on('click', '.file:not(.active)', showFileHandler);
var $filesWrapper = $('.files-wrapper');
$filesEl.on('click', '.file.active', function (ev) { var $scrollerRight = $('.scroller-right');
var $fileTabEl = $(this); var $scrollerLeft = $('.scroller-left');
var originalName = $fileTabEl.find('.name').text();
ev.preventDefault(); function widthOfList () {
if ($(this).find('input').length > 0) return false; var itemsWidth = 0;
var $fileNameInputEl = $('<input value="' + originalName + '"/>'); $('.file').each(function () {
$fileTabEl.html($fileNameInputEl); var itemWidth = $(this).outerWidth();
$fileNameInputEl.focus(); itemsWidth += itemWidth;
$fileNameInputEl.select(); });
$fileNameInputEl.on('blur', handleRename); return itemsWidth;
$fileNameInputEl.keyup(handleRename); }
function handleRename (ev) { // function widthOfHidden () {
ev.preventDefault(); // return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi());
if (ev.which && ev.which !== 13) return false; // }
var newName = ev.target.value;
$fileNameInputEl.off('blur'); function widthOfVisible () {
$fileNameInputEl.off('keyup'); return $filesWrapper.outerWidth();
}
if (newName !== originalName && confirm('Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
var content = window.localStorage.getItem(utils.fileKey(originalName)); function getLeftPosi () {
window.localStorage[utils.fileKey(newName)] = content; return $filesEl.position().left;
window.localStorage.removeItem(utils.fileKey(originalName)); }
editor.setCacheFile(newName);
} function activeFilePos () {
var el = $filesEl.find('.active');
updateFiles(); var l = el.position().left;
return false; return l;
} }
return false; function reAdjust () {
}); if (widthOfList() + getLeftPosi() > widthOfVisible()) {
$scrollerRight.fadeIn('fast');
$filesEl.on('click', '.file .remove', function (ev) { } else {
ev.preventDefault(); $scrollerRight.fadeOut('fast');
var name = $(this).parent().find('.name').text(); }
if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) { if (getLeftPosi() < 0) {
window.localStorage.removeItem(utils.fileKey(name)); $scrollerLeft.fadeIn('fast');
editor.setNextFile(utils.fileKey(name)); } else {
updateFiles(); $scrollerLeft.fadeOut('fast');
} $filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
return false; }
}); }
function showFileHandler (ev) { $scrollerRight.click(function () {
ev.preventDefault(); var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
editor.setCacheFile($(this).find('.name').text()); $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
updateFiles(); reAdjust();
return false; });
} });
function activeFileTab () {
var name = editor.getCacheFile();
return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
}
function updateFiles () {
var $filesEl = $('#files');
var files = editor.getFiles();
$filesEl.find('.file').remove();
for (var f in files) {
$filesEl.append(fileTabTemplate(files[f]));
}
if (editor.cacheFileIsPresent()) {
var active = activeFileTab();
active.addClass('active');
editor.resetSession();
}
$('#input').toggle(editor.cacheFileIsPresent());
$('#output').toggle(editor.cacheFileIsPresent());
reAdjust();
}
function fileTabTemplate (key) {
var name = utils.fileNameFromKey(key);
return $('<li class="file"><span class="name">' + name + '</span><span class="remove"><i class="fa fa-close"></i></span></li>');
}
var $filesWrapper = $('.files-wrapper');
var $scrollerRight = $('.scroller-right');
var $scrollerLeft = $('.scroller-left');
function widthOfList () {
var itemsWidth = 0;
$('.file').each(function () {
var itemWidth = $(this).outerWidth();
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');
var l = el.position().left;
return l;
}
function reAdjust () {
if (widthOfList() + getLeftPosi() > + widthOfVisible()) {
$scrollerRight.fadeIn('fast');
} else {
$scrollerRight.fadeOut('fast');
}
if (getLeftPosi() < 0) {
$scrollerLeft.fadeIn('fast');
} else {
$scrollerLeft.fadeOut('fast');
$filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
}
}
$scrollerRight.click(function () {
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);
$filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust();
});
});
updateFiles();
// ----------------- version selector-------------
// var soljsonSources is provided by bin/list.js
$('option', '#versionSelector').remove();
$.each(soljsonSources, function (i, file) {
if (file) {
var version = file.replace(/soljson-(.*).js/, '$1');
$('#versionSelector').append(new Option(version, file));
}
});
$('#versionSelector').change(function () {
queryParams.update({ version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val());
});
// ----------------- resizeable ui ---------------
var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
var dragging = false;
$('#dragbar').mousedown(function (e) {
e.preventDefault();
dragging = true;
var main = $('#righthand-panel');
var ghostbar = $('<div id="ghostbar">', {
css: {
top: main.offset().top,
left: main.offset().left
}
}).prependTo('body');
$(document).mousemove(function (e) {
ghostbar.css('left', e.pageX + 2);
});
});
var $body = $('body');
function setEditorSize (delta) {
$('#righthand-panel').css('width', delta);
$('#editor').css('right', delta);
onResize();
}
function getEditorSize () {
window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width();
}
$(document).mouseup(function (e) {
if (dragging) {
var delta = $body.width() - e.pageX + 2;
$('#ghostbar').remove();
$(document).unbind('mousemove');
dragging = false;
setEditorSize(delta);
window.localStorage.setItem(EDITOR_SIZE_CACHE_KEY, delta);
reAdjust();
}
});
// set cached defaults
var cachedSize = window.localStorage.getItem(EDITOR_SIZE_CACHE_KEY);
if (cachedSize) setEditorSize(cachedSize);
else getEditorSize();
// ----------------- toggle right hand panel -----------------
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) compiler.compile();
});
function getHidingRHP () { return hidingRHP; }
// ----------------- editor resize ---------------
function onResize () {
editor.resize();
reAdjust();
}
window.onresize = onResize;
onResize();
document.querySelector('#editor').addEventListener('change', onResize);
document.querySelector('#editorWrap').addEventListener('change', onResize);
// ----------------- compiler output renderer ----------------------
$('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
// ----------------- compiler ----------------------
function handleGithubCall (root, path, cb) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb);
}
var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles);
function setVersionText (text) {
$('#version').text(text);
}
var loadVersion = function (version) {
setVersionText('(loading)');
queryParams.update({version: version});
var isFirefox = typeof InstallTrigger !== 'undefined';
if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
// Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case.
compiler.loadVersion(true, version, setVersionText);
} else {
compiler.loadVersion(false, version, setVersionText);
}
};
loadVersion(queryParams.get().version || 'soljson-latest.js');
document.querySelector('#optimize').addEventListener('change', function () {
queryParams.update({optimize: document.querySelector('#optimize').checked });
compiler.compile();
});
storageHandler.sync(); $scrollerLeft.click(function () {
var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0);
$filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust();
});
});
updateFiles();
// ----------------- version selector-------------
// var soljsonSources is provided by bin/list.js
$('option', '#versionSelector').remove();
$.each(soljsonSources, function (i, file) {
if (file) {
var version = file.replace(/soljson-(.*).js/, '$1');
$('#versionSelector').append(new Option(version, file));
}
});
$('#versionSelector').change(function () {
queryParams.update({ version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val());
});
// ----------------- resizeable ui ---------------
var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
var dragging = false;
$('#dragbar').mousedown(function (e) {
e.preventDefault();
dragging = true;
var main = $('#righthand-panel');
var ghostbar = $('<div id="ghostbar">', {
css: {
top: main.offset().top,
left: main.offset().left
}
}).prependTo('body');
$(document).mousemove(function (e) {
ghostbar.css('left', e.pageX + 2);
});
});
var $body = $('body');
function setEditorSize (delta) {
$('#righthand-panel').css('width', delta);
$('#editor').css('right', delta);
onResize();
}
function getEditorSize () {
window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width();
}
$(document).mouseup(function (e) {
if (dragging) {
var delta = $body.width() - e.pageX + 2;
$('#ghostbar').remove();
$(document).unbind('mousemove');
dragging = false;
setEditorSize(delta);
window.localStorage.setItem(EDITOR_SIZE_CACHE_KEY, delta);
reAdjust();
}
});
// set cached defaults
var cachedSize = window.localStorage.getItem(EDITOR_SIZE_CACHE_KEY);
if (cachedSize) setEditorSize(cachedSize);
else getEditorSize();
// ----------------- toggle right hand panel -----------------
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) compiler.compile();
});
function getHidingRHP () { return hidingRHP; }
// ----------------- editor resize ---------------
function onResize () {
editor.resize();
reAdjust();
}
window.onresize = onResize;
onResize();
document.querySelector('#editor').addEventListener('change', onResize);
document.querySelector('#editorWrap').addEventListener('change', onResize);
// ----------------- compiler output renderer ----------------------
$('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
// ----------------- compiler ----------------------
function handleGithubCall (root, path, cb) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb);
}
var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles);
function setVersionText (text) {
$('#version').text(text);
}
var loadVersion = function (version) {
setVersionText('(loading)');
queryParams.update({version: version});
var isFirefox = typeof InstallTrigger !== 'undefined';
if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
// Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case.
compiler.loadVersion(true, version, setVersionText);
} else {
compiler.loadVersion(false, version, setVersionText);
}
};
loadVersion(queryParams.get().version || 'soljson-latest.js');
document.querySelector('#optimize').addEventListener('change', function () {
queryParams.update({ optimize: document.querySelector('#optimize').checked });
compiler.compile();
});
storageHandler.sync();
}; };
module.exports = { module.exports = {
'run': run 'run': run
}; };

75
src/app/compiler-worker.js
Unescape View File

@ -1,42 +1,41 @@
var version = function() { return '(loading)'; } var version = function () { return '(loading)'; };
var compileJSON = function() { return ''; } var compileJSON = function () { return ''; };
var missingInputs = []; var missingInputs = [];
module.exports = function (self) { module.exports = function (self) {
self.addEventListener('message', function(e) { self.addEventListener('message', function (e) {
var data = e.data; var data = e.data;
switch (data.cmd) { switch (data.cmd) {
case 'loadVersion': case 'loadVersion':
delete Module; delete Module;
version = null; version = null;
compileJSON = null; compileJSON = null;
importScripts(data.data); importScripts(data.data);
version = Module.cwrap("version", "string", []); version = Module.cwrap('version', 'string', []);
if ('_compileJSONCallback' in Module) if ('_compileJSONCallback' in Module) {
{ var compileJSONInternal = Module.cwrap('compileJSONCallback', 'string', ['string', 'number', 'number']);
compileJSONInternal = Module.cwrap("compileJSONCallback", "string", ["string", "number", "number"]); var missingInputCallback = Module.Runtime.addFunction(function (path) {
var missingInputCallback = Module.Runtime.addFunction(function(path) { missingInputs.push(Module.Pointer_stringify(path));
missingInputs.push(Module.Pointer_stringify(path)); });
}); compileJSON = function (input, optimize) {
compileJSON = function(input, optimize) { return compileJSONInternal(input, optimize, missingInputCallback);
return compileJSONInternal(input, optimize, missingInputCallback); };
}; } else if ('_compileJSONMulti' in Module) {
} compileJSON = Module.cwrap('compileJSONMulti', 'string', ['string', 'number']);
else if ('_compileJSONMulti' in Module) } else {
compileJSON = Module.cwrap("compileJSONMulti", "string", ["string", "number"]); compileJSON = Module.cwrap('compileJSON', 'string', ['string', 'number']);
else }
compileJSON = Module.cwrap("compileJSON", "string", ["string", "number"]); postMessage({
postMessage({ cmd: 'versionLoaded',
cmd: 'versionLoaded', data: version(),
data: version(), acceptsMultipleFiles: ('_compileJSONMulti' in Module)
acceptsMultipleFiles: ('_compileJSONMulti' in Module) });
}); break;
break; case 'compile':
case 'compile': missingInputs.length = 0;
missingInputs.length = 0; postMessage({cmd: 'compiled', data: compileJSON(data.source, data.optimize), missingInputs: missingInputs});
postMessage({cmd: 'compiled', data: compileJSON(data.source, data.optimize), missingInputs: missingInputs}); break;
break; }
} }, false);
}, false); };
}

28
src/app/compiler.js
Unescape View File

@ -42,7 +42,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
sourceAnnotations = []; sourceAnnotations = [];
outputField.empty(); outputField.empty();
var input = editor.getValue(); var input = editor.getValue();
editor.setCacheFileContent(input) editor.setCacheFileContent(input);
var files = {}; var files = {};
files[editor.getCacheFile()] = input; files[editor.getCacheFile()] = input;
@ -148,7 +148,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
function loadInternal (url, setVersionText) { function loadInternal (url, setVersionText) {
Module = null; Module = null;
// Set a safe fallback until the new one is loaded // Set a safe fallback until the new one is loaded
compileJSON = function(source, optimize) { compilationFinished('{}'); }; compileJSON = function (source, optimize) { compilationFinished('{}'); };
var newScript = document.createElement('script'); var newScript = document.createElement('script');
newScript.type = 'text/javascript'; newScript.type = 'text/javascript';
@ -171,14 +171,14 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
worker.addEventListener('message', function (msg) { worker.addEventListener('message', function (msg) {
var data = msg.data; var data = msg.data;
switch (data.cmd) { switch (data.cmd) {
case 'versionLoaded': case 'versionLoaded':
compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles; compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles;
onCompilerLoaded(setVersionText, data.data); onCompilerLoaded(setVersionText, data.data);
break; break;
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); });
@ -186,7 +186,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
worker.postMessage({cmd: 'compile', source: source, optimize: optimize}); worker.postMessage({cmd: 'compile', source: source, optimize: optimize});
}; };
worker.postMessage({cmd: 'loadVersion', data: url}); worker.postMessage({cmd: 'loadVersion', data: url});
}; }
function gatherImports (files, importHints, cb) { function gatherImports (files, importHints, cb) {
importHints = importHints || []; importHints = importHints || [];
@ -201,7 +201,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
reloop = false; reloop = false;
for (var fileName in files) { for (var fileName in files) {
var match; var match;
while (match = importRegex.exec(files[fileName])) { while ((match = importRegex.exec(files[fileName]))) {
importHints.push(match[1]); importHints.push(match[1]);
} }
} }
@ -219,7 +219,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
} else if (m in cachedRemoteFiles) { } else if (m in cachedRemoteFiles) {
files[m] = cachedRemoteFiles[m]; files[m] = cachedRemoteFiles[m];
reloop = true; reloop = true;
} else if (githubMatch = /^(https?:\/\/)?(www.)?github.com\/([^\/]*\/[^\/]*)\/(.*)/.exec(m)) { } else if ((githubMatch = /^(https?:\/\/)?(www.)?github.com\/([^\/]*\/[^\/]*)\/(.*)/.exec(m))) {
handleGithubCall(githubMatch[3], githubMatch[4], function (result) { handleGithubCall(githubMatch[3], githubMatch[4], function (result) {
if ('content' in result) { if ('content' in result) {
var content = Base64.decode(result.content); var content = Base64.decode(result.content);
@ -243,4 +243,4 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
} }
} }
module.exports = Compiler module.exports = Compiler;

2
src/app/editor.js
Unescape View File

@ -1,3 +1,5 @@
/* global BALLOT_EXAMPLE, FileReader */
var utils = require('./utils'); var utils = require('./utils');
var ace = require('brace'); var ace = require('brace');

2
src/app/execution-context.js
Unescape View File

@ -1,3 +1,5 @@
/* global confirm */
var $ = require('jquery'); var $ = require('jquery');
var Web3 = require('web3'); var Web3 = require('web3');

2
src/app/gist-handler.js
Unescape View File

@ -1,3 +1,5 @@
/* global prompt */
var queryParams = require('./query-params'); var queryParams = require('./query-params');
function handleLoad (cb) { function handleLoad (cb) {

4
src/app/query-params.js
Unescape View File

@ -34,5 +34,5 @@ function updateQueryParams (params) {
module.exports = { module.exports = {
get: getQueryParams, get: getQueryParams,
update: updateQueryParams, update: updateQueryParams
}; };

33
src/app/renderer.js
Unescape View File

@ -6,7 +6,6 @@ var utils = require('./utils');
var ExecutionContext = require('./execution-context'); var ExecutionContext = require('./execution-context');
function Renderer (editor, compiler, updateFiles) { function Renderer (editor, compiler, updateFiles) {
var detailsOpen = {}; var detailsOpen = {};
var executionContext = new ExecutionContext(compiler); var executionContext = new ExecutionContext(compiler);
@ -33,7 +32,7 @@ function Renderer (editor, compiler, updateFiles) {
// Switch to file // Switch to file
editor.setCacheFile(errFile); editor.setCacheFile(errFile);
updateFiles(); updateFiles();
// @TODO could show some error icon in files with errors // @TODO could show some error icon in files with errors
} }
editor.handleErrorClick(errLine, errCol); editor.handleErrorClick(errLine, errCol);
}); });
@ -43,7 +42,7 @@ function Renderer (editor, compiler, updateFiles) {
return false; return false;
}); });
} }
}; }
this.error = renderError; this.error = renderError;
var combined = function (contractName, jsonInterface, bytecode) { var combined = function (contractName, jsonInterface, bytecode) {
@ -51,7 +50,6 @@ function Renderer (editor, compiler, updateFiles) {
}; };
function renderContracts (data, source) { function renderContracts (data, source) {
var udappContracts = []; var udappContracts = [];
for (var contractName in data.contracts) { for (var contractName in data.contracts) {
var contract = data.contracts[contractName]; var contract = data.contracts[contractName];
@ -105,7 +103,7 @@ function Renderer (editor, compiler, updateFiles) {
$contractOutput.find('.title').click(function (ev) { $(this).closest('.contract').toggleClass('hide'); }); $contractOutput.find('.title').click(function (ev) { $(this).closest('.contract').toggleClass('hide'); });
$('#output').append($contractOutput); $('#output').append($contractOutput);
$('.col2 input,textarea').click(function () { this.select(); }); $('.col2 input,textarea').click(function () { this.select(); });
}; }
this.contracts = renderContracts; this.contracts = renderContracts;
var tableRowItems = function (first, second, cls) { var tableRowItems = function (first, second, cls) {
@ -132,8 +130,9 @@ function Renderer (editor, compiler, updateFiles) {
.append(tableRow('Solidity Interface', contract.solidity_interface)) .append(tableRow('Solidity Interface', contract.solidity_interface))
.append(tableRow('Opcodes', contract.opcodes)); .append(tableRow('Opcodes', contract.opcodes));
var funHashes = ''; var funHashes = '';
for (var fun in contract.functionHashes) for (var fun in contract.functionHashes) {
funHashes += contract.functionHashes[fun] + ' ' + fun + '\n'; funHashes += contract.functionHashes[fun] + ' ' + fun + '\n';
}
details.append($('<span class="col1">Functions</span>')); details.append($('<span class="col1">Functions</span>'));
details.append($('<pre/>').text(funHashes)); details.append($('<pre/>').text(funHashes));
details.append($('<span class="col1">Gas Estimates</span>')); details.append($('<span class="col1">Gas Estimates</span>'));
@ -154,7 +153,7 @@ function Renderer (editor, compiler, updateFiles) {
}; };
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 = '';
var fun; var fun;
if ('creation' in data) { if ('creation' in data) {
@ -217,16 +216,15 @@ function Renderer (editor, compiler, updateFiles) {
}); });
code += '\n {' + code += '\n {' +
'\n from: web3.eth.accounts[0], ' + '\n from: web3.eth.accounts[0], ' +
'\n data: \'' + bytecode + '\', ' + '\n data: \'' + bytecode + '\', ' +
'\n gas: 3000000' + '\n gas: 3000000' +
'\n }, function (e, contract){' + '\n }, function (e, contract){' +
'\n console.log(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 console.log(\'Contract mined! address: \' + contract.address + \' transactionHash: \' + contract.transactionHash);' +
'\n }' + '\n }' +
'\n })'; '\n })';
return code; return code;
} }
@ -241,7 +239,6 @@ function Renderer (editor, compiler, updateFiles) {
} }
return funABI; return funABI;
} }
} }
module.exports = Renderer; module.exports = Renderer;

11
src/app/storage-handler.js
Unescape View File

@ -1,17 +1,16 @@
/* global chrome, confirm, localStorage */
var utils = require('./utils'); var utils = require('./utils');
function StorageHandler (updateFiles) { function StorageHandler (updateFiles) {
this.sync = function () { this.sync = function () {
if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) { if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) {
return; return;
} }
var obj = {}; var obj = {};
var done = false; var done = false;
var count = 0 var count = 0;
var dont = 0;
function check (key) { function check (key) {
chrome.storage.sync.get(key, function (resp) { chrome.storage.sync.get(key, function (resp) {
@ -28,9 +27,9 @@ function StorageHandler (updateFiles) {
if (done >= count) { if (done >= count) {
chrome.storage.sync.set(obj, function () { 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) {

2
src/index.js
Unescape View File

@ -2,4 +2,4 @@ require('es6-shim');
var app = require('./app.js'); var app = require('./app.js');
var $ = require('jquery'); var $ = require('jquery');
$(document).ready(function () { app.run(); }); $(document).ready(function () { app.run(); });

1116
src/universal-dapp.js
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save