Merge branch 'es6' into master

Amphiluke · Nov 25, 2016 · 2334a92 · 2334a92
2 parents f1848f7 + 25cb07c
commit 2334a92
Show file tree

Hide file tree

Showing 106 changed files with 5,022 additions and 39,988 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "transform-es2015-modules-amd"
+  ]
+}
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,3 @@
+node_modules
+vendor
+build
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,31 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {"SwitchCase": 1}
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 logs
 *.log
 
+# IDE files
+.idea
+
 # Runtime data
 pids
 *.pid
@@ -26,4 +29,10 @@ node_modules
 
 # Storage
 store/*
-!store/README.md
+!store/README.md
+
+# Generated files
+dev/js/**/*.amd.js
+dev/css/**/*.css
+vendor/*
+!vendor/README.md
diff --git a/build/css/main.css b/build/css/main.css
diff --git a/build/src/img/dot.gif → build/img/dot.gif b/build/src/img/dot.gif → build/img/dot.gif
diff --git a/build/src/img/loader.gif → build/img/loader.gif b/build/src/img/loader.gif → build/img/loader.gif
diff --git a/build/index.html b/build/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8"/>
     <title>Open evolver</title>
     <link rel="icon" type="image/png" href="../favicon.png"/>
-    <link rel="stylesheet" href="src/css/main.css"/>
+    <link rel="stylesheet" href="css/main.css"/>
 </head>
 <body>
 
@@ -18,7 +18,7 @@
             <hr/>
             <menuitem label="Save summary…" data-action="saveSummary"></menuitem>
         </menu>
-        <input type="file" id="oe-file" autocomplete="off"/>
+        <input type="file" id="oe-file" autocomplete="off" accept=".hin,.ml2,.mol2,.xyz"/>
     </li>
     <li>
         <button type="menu" value="Edit" menu="edit-menu"></button>
@@ -224,18 +224,29 @@ <h2>Save evolution log</h2>
     </p>
 </div>
 
-<p class="oe-acknowledgements">Powered by <a href="http://threejs.org/" rel="nofollow" target="_blank">three.js</a></p>
-<div id="oe-view"></div>
+<div id="oe-view"><canvas></canvas></div>
 
 <div class="oe-report hidden">
     <p><progress id="oe-report-progress" value="0" max="100"></progress></p>
     <dl id="oe-report-data"></dl>
 </div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r72/three.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-<script src="src/js/fallback.js"></script>
-<script src="src/js/main.js"></script>
+<script src="../vendor/system.js"></script>
+<script>
+    System.config({
+        baseURL: "./js",
+        map: {
+            jquery: "../vendor/jquery.min.js",
+            _: "../vendor/lodash.min.js",
+            three: "../vendor/three.min.js"
+        },
+        meta: {
+            jquery: {format: "cjs"},
+            _: {format: "cjs"},
+            three: {format: "cjs"}
+        }
+    });
+    System.import("interface.amd.js");
+</script>
 </body>
 </html>