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

fix multiple files bugs

Browse Source
pull/1/head
d11e9 9 years ago
parent 0631065907
commit 5eb10e8414
2 changed files with 8 additions and 15 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. 20
      index.html
  2. 3
      stylesheets/browser-solidity.css

20
index.html
Unescape View File

@ -93,11 +93,12 @@ THE SOFTWARE.
var solFiles = JSON.parse( window.localStorage.getItem( SOL_CACHE_FILES_KEY ) ) || [SOL_CACHE_FILE]; var solFiles = JSON.parse( window.localStorage.getItem( SOL_CACHE_FILES_KEY ) ) || [SOL_CACHE_FILE];
window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) ); window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) );
var solCache = window.localStorage.getItem( SOL_CACHE_FILE ); var solCache = window.localStorage.getItem( SOL_CACHE_FILE ) || BALLOT_EXAMPLE;
editor.setValue( solCache || BALLOT_EXAMPLE, 1 ); window.localStorage.setItem( SOL_CACHE_FILE, solCache )
editor.setValue( solCache, 1 );
session.setMode("ace/mode/javascript"); session.setMode("ace/mode/javascript");
session.setTabSize(4); session.setTabSize(4);
session.setUseSoftTabs(true); session.setUseSoftTabs(true);
@ -113,7 +114,6 @@ THE SOFTWARE.
SOL_CACHE_FILE = name; SOL_CACHE_FILE = name;
window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) ); window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) );
window.localStorage.setItem( SOL_CACHE_FILE, '' ); window.localStorage.setItem( SOL_CACHE_FILE, '' );
console.log('new file added: ', solFiles)
updateFiles(); updateFiles();
}) })
@ -122,7 +122,6 @@ THE SOFTWARE.
$filesEl.on( 'click','.file.active', function(ev){ $filesEl.on( 'click','.file.active', function(ev){
var $fileTabEl = $(this) var $fileTabEl = $(this)
var originalName = $fileTabEl.find('.name').text() var originalName = $fileTabEl.find('.name').text()
console.log("click active: ", originalName )
ev.preventDefault() ev.preventDefault()
if ($(this).find('input').length > 0 ) return false; if ($(this).find('input').length > 0 ) return false;
var $fileNameInputEl = $('<input value="'+originalName+'"/>'); var $fileNameInputEl = $('<input value="'+originalName+'"/>');
@ -135,10 +134,10 @@ THE SOFTWARE.
var $new = null var $new = null
if (confirm( "Are you sure you want to rename: " + originalName + " to " + newName + '?' )) { if (confirm( "Are you sure you want to rename: " + originalName + " to " + newName + '?' )) {
solFiles[solFiles.indexOf(originalName)] = newName solFiles.splice( solFiles.indexOf(originalName), 1, newName );
window.localStorage.setItem( newName, window.localStorage.getItem(originalName) ); window.localStorage.setItem( newName, window.localStorage.getItem(originalName) );
window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) ); window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) );
window.localStorage.setItem( originalName, '') window.localStorage.removeItem( originalName )
SOL_CACHE_FILE = newName; SOL_CACHE_FILE = newName;
updateFiles() updateFiles()
} }
@ -154,12 +153,11 @@ THE SOFTWARE.
var name = $(this).parent().find('.name').text() var name = $(this).parent().find('.name').text()
if (confirm( "Are you sure you want to remove: " + name + " from local storage?" )) { if (confirm( "Are you sure you want to remove: " + name + " from local storage?" )) {
console.log("remove file, ", ev.target)
var index = solFiles.indexOf(name); var index = solFiles.indexOf(name);
solFiles[index] = undefined; solFiles.splice(index, 1 );
window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) ); window.localStorage.setItem( SOL_CACHE_FILES_KEY, JSON.stringify( solFiles ) );
SOL_CACHE_FILE = solFiles[ Math.max(0, index - 1)] SOL_CACHE_FILE = solFiles[ Math.max(0, index - 1)]
window.localStorage.setItem( name, null) window.localStorage.removeItem( name )
updateFiles() updateFiles()
} }
return false; return false;
@ -168,7 +166,6 @@ THE SOFTWARE.
function showFileHandler (ev) { function showFileHandler (ev) {
ev.preventDefault() ev.preventDefault()
SOL_CACHE_FILE = $(this).find('.name').text(); SOL_CACHE_FILE = $(this).find('.name').text();
console.log('click normal', SOL_CACHE_FILE, typeof window.localStorage.getItem( SOL_CACHE_FILE ))
updateFiles() updateFiles()
return false; return false;
} }
@ -178,7 +175,6 @@ THE SOFTWARE.
} }
function updateFiles () { function updateFiles () {
console.log("Update files", solFiles, SOL_CACHE_FILE, typeof window.localStorage.getItem( SOL_CACHE_FILE ) )
$filesEl.find('.file').remove() $filesEl.find('.file').remove()
for (var f in solFiles) { for (var f in solFiles) {
if (solFiles[f]) $filesEl.append( fileTabTemplate(solFiles[f]) ); if (solFiles[f]) $filesEl.append( fileTabTemplate(solFiles[f]) );

3
stylesheets/browser-solidity.css
Unescape View File

@ -39,9 +39,6 @@ body {
#files .file.active { #files .file.active {
font-weight: bold; font-weight: bold;
background-color: #F0F0F0;
border: 1px solid #BFBFBF;
box-shadow: 0 0 5px rgba(0,0,0,0.25);
border-bottom: 0 none; border-bottom: 0 none;
padding-right: 2.5em; padding-right: 2.5em;
} }

Write Preview
Loading…
Cancel
Save