moving storage and theme-chooser to the remix side and updating files

src/app.js

@@ -13,7 +13,7 @@ var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
 var QueryParams = require('./lib/query-params')
 var GistHandler = require('./lib/gist-handler')
 var helper = require('./lib/helper')
-var Storage = require('./storage')
+var Storage = remixLib.Storage
 var Browserfiles = require('./app/files/browser-files')
 var chromeCloudStorageSync = require('./app/files/chromeCloudStorageSync')
 var SharedFolder = require('./app/files/shared-folder')
@@ -38,7 +38,7 @@ var ContextualListener = require('./app/editor/contextualListener')
 var ContextView = require('./app/editor/contextView')
 var BasicReadOnlyExplorer = require('./app/files/basicReadOnlyExplorer')
 
-var styleGuide = require('./app/theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/editor/contextView.js

@@ -2,7 +2,7 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var remixLib = require('remix-lib')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 var SourceMappingDecoder = remixLib.SourceMappingDecoder
 

src/app/editor/editor.js

@@ -12,7 +12,7 @@ require('brace/ext/language_tools')
 require('brace/ext/searchbox')
 var langTools = ace.acequire('ace/ext/language_tools')
 require('./mode-solidity.js')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 function setTheme (cb) {

src/app/execution/txLogger.js

@@ -5,7 +5,7 @@ var copyToClipboard = require('../ui/copy-to-clipboard')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
 var remixLib = require('remix-lib')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var EventManager = remixLib.EventManager

src/app/files/file-explorer.js

@@ -9,7 +9,7 @@ var EventManager = remixLib.EventManager
 
 var helper = require('../../lib/helper')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/panels/editor-panel.js

@@ -2,7 +2,7 @@ var csjs = require('csjs-inject')
 var yo = require('yo-yo')
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var Terminal = require('./terminal')

src/app/panels/file-panel.js

@@ -12,7 +12,7 @@ var QueryParams = require('../../lib/query-params')
 var queryParams = new QueryParams()
 var helper = require('../../lib/helper')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 module.exports = filepanel

src/app/panels/righthand-panel.js

@@ -13,7 +13,7 @@ var PluginManager = require('../../pluginManager')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/panels/terminal.js

@@ -10,10 +10,11 @@ var Web3 = require('web3')
 
 var executionContext = require('../../execution-context')
 var Dropdown = require('../ui/dropdown')
+
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/staticanalysis/staticAnalysisView.js

@@ -6,7 +6,7 @@ var remixLib = require('remix-lib')
 var utils = remixLib.util
 var csjs = require('csjs-inject')
 
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var EventManager = remixLib.EventManager

src/app/tabs/analysis-tab.js

 var yo = require('yo-yo')
+var remixLib = require('remix-lib')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/tabs/compile-tab.js

@@ -9,10 +9,11 @@ var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
 var TreeView = require('remix-debugger').ui.TreeView
 var copyToClipboard = require('../ui/copy-to-clipboard')
+var remixLib = require('remix-lib')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/tabs/debugger-tab.js

 var yo = require('yo-yo')
-
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/tabs/run-tab.js

@@ -13,7 +13,7 @@ var EventManager = require('remix-lib').EventManager
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/tabs/settings-tab.js

@@ -2,8 +2,9 @@
 var $ = require('jquery')
 var yo = require('yo-yo')
 var QueryParams = require('../../lib/query-params')
-var Storage = require('../../storage')
-var styleGuide = require('../theme/theme-chooser')
+var remixLib = require('remix-lib')
+var Storage = remixLib.Storage
+var styleGuide = remixLib.ui.themeChooser
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')

src/app/tabs/support-tab.js

@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/tabs/tabbed-menu.js

@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var helper = require('../../lib/helper')

src/app/theme/theme-chooser.js

-var remixLib = require('remix-lib')
-var styleGuideLight = remixLib.ui.styleGuide
-var styleGuideDark = remixLib.ui.styleGuideDark
-var Storage = require('../../storage')
-module.exports = {
-
-  chooser: function () {
-    var themeStorage = new Storage('style:')
-    if (themeStorage.exists('theme')) {
-      console.log('10! ' + themeStorage.exists('theme'))
-      // console.log('lll ' + )
-      if (themeStorage.get('theme') === 'dark') {
-        return styleGuideDark()
-      } else {
-        return styleGuideLight()
-      }
-    } else {
-      console.log('17! ' + themeStorage.exists('style:'))
-      return styleGuideLight()
-    }
-  },
-
-  switchTheme: function (theme) {
-    var themeStorage = new Storage('style:')
-    themeStorage.set('theme', theme)
-    if (theme === 'dark') {
-      return styleGuideDark()
-    } else if (theme === 'light') {
-      return styleGuideLight()
-    } else {
-      return styleGuideLight()
-    }
-  }
-}

src/app/ui/copy-to-clipboard.js

@@ -4,7 +4,7 @@ const copy = require('clipboard-copy')
 var addTooltip = require('./tooltip')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/ui/dropdown.js

@@ -3,7 +3,7 @@ var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/ui/modaldialog.js

 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/app/ui/renderer.js

@@ -5,7 +5,7 @@ var yo = require('yo-yo')
 
 // -------------- styling ----------------------
 // var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = yo`<style>

src/app/ui/tooltip.js

 var yo = require('yo-yo')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../theme/theme-chooser')
+var styleGuide = require('remix-lib').ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`

src/storage.js

-'use strict'
-
-function Storage (prefix) {
-  this.exists = function (name) {
-    return this.get(name) !== null
-  }
-
-  this.get = function (name) {
-    return window.localStorage.getItem(prefix + name)
-  }
-
-  this.set = function (name, content) {
-    try {
-      window.localStorage.setItem(prefix + name, content)
-    } catch (exception) {
-      return false
-    }
-    return true
-  }
-
-  this.remove = function (name) {
-    window.localStorage.removeItem(prefix + name)
-    return true
-  }
-
-  this.rename = function (originalName, newName) {
-    var content = this.get(originalName)
-    if (!this.set(newName, content)) {
-      return false
-    }
-    this.remove(originalName)
-    return true
-  }
-
-  function safeKeys () {
-    // NOTE: this is a workaround for some browsers
-    return Object.keys(window.localStorage).filter(function (item) { return item !== null && item !== undefined })
-  }
-
-  this.keys = function () {
-    return safeKeys()
-      // filter any names not including the prefix
-      .filter(function (item) { return item.indexOf(prefix, 0) === 0 })
-      // remove prefix from filename and add the 'browser' path
-      .map(function (item) { return item.substr(prefix.length) })
-  }
-
-  // on startup, upgrade the old storage layout
-  safeKeys().forEach(function (name) {
-    if (name.indexOf('sol-cache-file-', 0) === 0) {
-      var content = window.localStorage.getItem(name)
-      window.localStorage.setItem(name.replace(/^sol-cache-file-/, 'sol:'), content)
-      window.localStorage.removeItem(name)
-    }
-  })
-
-  // remove obsolete key
-  window.localStorage.removeItem('editor-size-cache')
-}
-
-module.exports = Storage

src/universal-dapp.js

@@ -18,8 +18,7 @@ var copyToClipboard = require('./app/ui/copy-to-clipboard')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-
-var styleGuide = require('./app/theme/theme-chooser')
+var styleGuide = remixLib.ui.themeChooser
 var styles = styleGuide.chooser()
 
 var css = csjs`