Merge pull request #1971 from ethereum/switchPreviousVersion

switch to previous version
6 years ago · 09baddce3d
parent 0c3340e22d d9c8bf1c55
commit 09baddce3d
15 changed files with 273859 additions and 10 deletions
--- a/assets/css/font-awesome.min.css
+++ b/assets/css/font-awesome.min.css
--- a/assets/fonts/FontAwesome.otf
+++ b/assets/fonts/FontAwesome.otf
--- a/assets/fonts/fontawesome-webfont.eot
+++ b/assets/fonts/fontawesome-webfont.eot
--- a/assets/fonts/fontawesome-webfont.svg
+++ b/assets/fonts/fontawesome-webfont.svg
--- a/assets/fonts/fontawesome-webfont.ttf
+++ b/assets/fonts/fontawesome-webfont.ttf
--- a/assets/fonts/fontawesome-webfont.woff
+++ b/assets/fonts/fontawesome-webfont.woff
--- a/assets/fonts/fontawesome-webfont.woff2
+++ b/assets/fonts/fontawesome-webfont.woff2
--- a/assets/img/gasStation_50.png
+++ b/assets/img/gasStation_50.png
--- a/assets/js/0.7.7/app.js
+++ b/assets/js/0.7.7/app.js
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@ -21,8 +21,8 @@ else
 fi
 SC_VERSION="4.5.1"
 SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-$OS.$FILEFORMAT"
-SAUCECONNECT_USERNAME="chriseth"
-SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca"
+SAUCECONNECT_USERNAME="yanneth"
+SAUCECONNECT_ACCESSKEY="1f5a4560-b02b-41aa-b52b-f033aad30870"
 BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
 echo "$BUILD_ID"
 SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${BUILD_ID}"
--- a/index.html
+++ b/index.html
@ -27,14 +27,59 @@
 		THE SOFTWARE.
 		-->
 		<meta http-equiv="X-UA-Compatible" content="chrome=1">
-		<title>Remix - Solidity IDE</title>
+		<title>Remix - Ethereum IDE</title>
 		<link rel="stylesheet" id="theme-link"/>
-		<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 		<link rel="stylesheet" href="assets/css/pygment_trac.css">
 		<link rel="icon" type="x-icon" href="icon.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 	</head>
 	<body>
-		<script src="build/app.js"></script>
+		<script>
+				function  urlParams () {
+					var qs = window.location.hash.substr(1)
+
+					if (window.location.search.length > 0) {
+						// use legacy query params instead of hash
+						window.location.hash = window.location.search.substr(1)
+						window.location.search = ''
+					}
+
+					var params = {}
+					var parts = qs.split('&')
+					for (var x in parts) {
+						var keyValue = parts[x].split('=')
+						if (keyValue[0] !== '') {
+							params[keyValue[0]] = keyValue[1]
+						}
+					}	
+					return params
+				}
+        const defaultVersion = window.location.hostname === 'remix.ethereum.org' ? '0.7.7' : '0.8.0'
+        let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
+                
+				let assets = {
+						'0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'],
+						'0.7.7': ['assets/css/font-awesome.min.css', 'assets/css/pygment_trac.css']
+				}
+				let versions = {
+						'0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e
+						'0.8.0': 'build/app.js'
+				}
+				for (let k in assets[versionToLoad]) {
+          let app = document.createElement('link')
+          app.setAttribute('rel', 'stylesheet')
+          app.setAttribute('href', assets[versionToLoad][k])
+          if (assets[versionToLoad][k] === 'https://use.fontawesome.com/releases/v5.8.1/css/all.css') {
+            app.setAttribute('integrity', 'sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf')
+            app.setAttribute('crossorigin', 'anonymous')
+          }
+          document.head.appendChild(app)
+        }
+				window.onload = () => {
+					let app = document.createElement('script')
+					app.setAttribute('src', versions[versionToLoad])
+					document.body.appendChild(app)
+				}				
+		</script>
 	</body>
 </html>
--- a/nightwatch.js
+++ b/nightwatch.js
@ -16,8 +16,8 @@ module.exports = {
      'selenium_host': 'ondemand.saucelabs.com',
      'selenium_port': 80,
      'silent': true,
-      'username': 'chriseth',
-      'access_key': 'b781828a-9e9c-43d8-89d4-2fbb879595ca',
+      'username': 'yanneth',
+      'access_key': '1f5a4560-b02b-41aa-b52b-f033aad30870',
      'use_ssl': false,
      'globals': {
        'waitForConditionTimeout': 10000,
@ -78,7 +78,7 @@ module.exports = {
      'selenium_port': 4444,
      'selenium_host': 'localhost',
      'desiredCapabilities': {
-        'browserName': 'firefox',
+        'browserName': 'chrome',
        'javascriptEnabled': true,
        'acceptSslCerts': true
      }
--- a/package.json
+++ b/package.json
@ -90,7 +90,8 @@
    "ignore": [
      "build/",
      "src/app/editor/mode-solidity.js",
-      "soljson.js"
+      "soljson.js",
+      "assets/js/0.7.7/app.js"
    ],
    "parser": "babel-eslint"
  },
--- a/src/app/ui/landing-page/landing-page.js
+++ b/src/app/ui/landing-page/landing-page.js
@ -4,6 +4,7 @@ let globalRegistry = require('../../../global/registry')
 let CompilerImport = require('../../compiler/compiler-imports')
 var modalDialogCustom = require('../modal-dialog-custom')
 var tooltip = require('../tooltip')
+var QueryParams = require('../../../lib/query-params.js')

 let css = csjs`
  .text {
@ -174,6 +175,11 @@ export class LandingPage extends BaseApi {
      }
    })

+    let switchToPreviousVersion = () => {
+      const query = new QueryParams()
+      query.update({appVersion: '0.7.7'})
+      document.location.reload()
+    }
    let container = yo`<div class="${css.homeContainer} bg-light">
      <div class="${css.jumbotronContainer}">
        <div class="alert alert-info clearfix ${css.thisJumboton}">
@ -185,6 +191,7 @@ export class LandingPage extends BaseApi {
          </div>
          <div class="${css.jumboBtnContainer}">
            <button class="btn btn-primary btn-lg" href="#" onclick=${() => { learnMore() }} role="button">Learn more</button>
+            <button class="btn btn-secondary btn-lg" onclick=${() => { switchToPreviousVersion() }}>Switch to the previous version</button>
          </div>
        </div><!-- end of jumbotron -->
      </div><!-- end of jumbotron container -->
--- a/test-browser/helpers/init.js
+++ b/test-browser/helpers/init.js
@ -17,7 +17,7 @@ module.exports = function (browser, callback) {
 }

 function initModules (browser, callback) {
-  browser.click('#icon-panel div[plugin="pluginManager"]')
+  browser.pause(3000).click('#icon-panel div[plugin="pluginManager"]')
  .execute(function () {
    document.querySelector('div[id="pluginManager"]').scrollTop = document.querySelector('div[id="pluginManager"]').scrollHeight
  }, [], function () {