A few more small improvements

pull/1/head
Dave Hoover 9 years ago
parent b733030311
commit 41df689921
  1. 54
      src/app.js
  2. 12
      src/app/editor.js

@ -21,17 +21,6 @@ window.addEventListener("message", function(ev) {
var run = function() { var run = function() {
// ------------------ query params (hash) ----------------
function syncQueryParams() {
$('#optimize').attr( 'checked', (queryParams.get().optimize == "true") );
}
window.onhashchange = syncQueryParams;
syncQueryParams();
// ------------------ gist load ----------------
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);
@ -48,6 +37,26 @@ var run = function() {
updateFiles(); updateFiles();
} }
loadFilesCallback = function(files) {
loadFiles(files);
};
if (filesToLoad !== null)
loadFiles(filesToLoad);
// ------------------ query params (hash) ----------------
function syncQueryParams() {
$('#optimize').attr( 'checked', (queryParams.get().optimize == "true") );
}
window.onhashchange = syncQueryParams;
syncQueryParams();
// ------------------ gist load ----------------
var loadingFromGist = gistHandler.handleLoad(function(gistId) { var loadingFromGist = gistHandler.handleLoad(function(gistId) {
$.ajax({ $.ajax({
url: 'https://api.github.com/gists/'+gistId, url: 'https://api.github.com/gists/'+gistId,
@ -65,11 +74,6 @@ var run = function() {
}); });
}); });
loadFilesCallback = function(files) {
loadFiles(files);
};
if (filesToLoad !== null)
loadFiles(filesToLoad);
// ----------------- storage -------------------- // ----------------- storage --------------------
@ -103,22 +107,10 @@ var run = function() {
// ------------------ gist publish -------------- // ------------------ gist publish --------------
var packageFiles = function() {
var files = {};
var filesArr = editor.getFiles();
for (var f in filesArr) {
files[utils.fileNameFromKey(filesArr[f])] = {
content: localStorage[filesArr[f]]
};
}
return files;
};
$('#gist').click(function(){ $('#gist').click(function(){
if (confirm("Are you sure you want to publish all your files anonymously as a public gist on github.com?")) { if (confirm("Are you sure you want to publish all your files anonymously as a public gist on github.com?")) {
var files = packageFiles(); 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="; 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({ $.ajax({
@ -144,7 +136,7 @@ var run = function() {
); );
if (target === null) if (target === null)
return; return;
var files = packageFiles(); var files = editor.packageFiles();
var iframe = $('<iframe/>', {src: target, style: "display:none;", load: function() { var iframe = $('<iframe/>', {src: target, style: "display:none;", load: function() {
this.contentWindow.postMessage(["loadFiles", files], "*"); this.contentWindow.postMessage(["loadFiles", files], "*");
}}).appendTo('body'); }}).appendTo('body');
@ -263,7 +255,7 @@ var run = function() {
} }
function widthOfHidden(){ function widthOfHidden(){
return (($filesWrapper.outerWidth()) - widthOfList() - getLeftPosi()); return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi());
} }
function widthOfVisible(){ function widthOfVisible(){

@ -52,6 +52,18 @@ function Editor(loadingFromGist) {
return files; return files;
} }
this.packageFiles = function() {
var files = {};
var filesArr = this.getFiles();
for (var f in filesArr) {
files[utils.fileNameFromKey(filesArr[f])] = {
content: localStorage[filesArr[f]]
};
}
return files;
};
this.resize = function() { this.resize = function() {
editor.resize(); editor.resize();
var session = editor.getSession(); var session = editor.getSession();

Loading…
Cancel
Save