From 3418e8216bf22e70bbd83b49cf5ca8ca87e417d0 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 17 Jan 2017 10:16:24 +0000
Subject: [PATCH 1/4] Editor: rename loadingFromGist

---
 src/app/editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/editor.js b/src/app/editor.js
index bc51642b0a..25ff193ea1 100644
--- a/src/app/editor.js
+++ b/src/app/editor.js
@@ -6,7 +6,7 @@ var examples = require('./example-contracts')
 var ace = require('brace')
 require('../mode-solidity.js')
 
-function Editor (loadingFromGist, storage) {
+function Editor (doNotLoadStorage, storage) {
   var SOL_CACHE_UNTITLED = 'Untitled'
   var SOL_CACHE_FILE = null
 
@@ -172,7 +172,7 @@ function Editor (loadingFromGist, storage) {
 
   function setupStuff (files) {
     if (files.length === 0) {
-      if (loadingFromGist) return
+      if (doNotLoadStorage) return
       files.push(examples.ballot.name)
       storage.set(examples.ballot.name, examples.ballot.content)
     }

From 96db85b6e5f62575c8ccc1474e56f9740929f2c7 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 17 Jan 2017 10:17:09 +0000
Subject: [PATCH 2/4] Editor: move getFiles to init

---
 src/app/editor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/editor.js b/src/app/editor.js
index 25ff193ea1..cd3cac5893 100644
--- a/src/app/editor.js
+++ b/src/app/editor.js
@@ -15,7 +15,7 @@ function Editor (doNotLoadStorage, storage) {
   var sessions = {}
   var sourceAnnotations = []
 
-  setupStuff(getFiles())
+  setupStuff()
 
   this.addMarker = function (range, cssClass) {
     return editor.session.addMarker(range, cssClass)
@@ -170,7 +170,9 @@ function Editor (doNotLoadStorage, storage) {
     return s
   }
 
-  function setupStuff (files) {
+  function setupStuff () {
+    var files = getFiles()
+
     if (files.length === 0) {
       if (doNotLoadStorage) return
       files.push(examples.ballot.name)

From d88035e5de00d049a6fb857e61a1bfe2d06f6bfb Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 17 Jan 2017 10:18:40 +0000
Subject: [PATCH 3/4] Editor: move command setup to the beginning of init

---
 src/app/editor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/editor.js b/src/app/editor.js
index cd3cac5893..f5ec5db238 100644
--- a/src/app/editor.js
+++ b/src/app/editor.js
@@ -171,6 +171,10 @@ function Editor (doNotLoadStorage, storage) {
   }
 
   function setupStuff () {
+    // Unmap ctrl-t & ctrl-f
+    editor.commands.bindKeys({ 'ctrl-t': null })
+    editor.commands.bindKeys({ 'ctrl-f': null })
+
     var files = getFiles()
 
     if (files.length === 0) {
@@ -187,10 +191,6 @@ function Editor (doNotLoadStorage, storage) {
 
     editor.setSession(sessions[SOL_CACHE_FILE])
     editor.resize(true)
-
-    // Unmap ctrl-t & ctrl-f
-    editor.commands.bindKeys({ 'ctrl-t': null })
-    editor.commands.bindKeys({ 'ctrl-f': null })
   }
 }
 

From 31dca0dbb940a8f7009b589603c45faab05f2be2 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 17 Jan 2017 10:19:23 +0000
Subject: [PATCH 4/4] Editor: stop earlier if not loading from storage

---
 src/app/editor.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/editor.js b/src/app/editor.js
index f5ec5db238..fcec8896d1 100644
--- a/src/app/editor.js
+++ b/src/app/editor.js
@@ -175,10 +175,13 @@ function Editor (doNotLoadStorage, storage) {
     editor.commands.bindKeys({ 'ctrl-t': null })
     editor.commands.bindKeys({ 'ctrl-f': null })
 
+    if (doNotLoadStorage) {
+      return
+    }
+
     var files = getFiles()
 
     if (files.length === 0) {
-      if (doNotLoadStorage) return
       files.push(examples.ballot.name)
       storage.set(examples.ballot.name, examples.ballot.content)
     }