Miscellaneous fixes. Refactoring

.eslintignore

@@ -1,3 +1,4 @@
 node_modules
 vendor
-build
+build
+dev/js/**/*.amd.js

build/js/interface.amd.js

@@ -890,7 +890,7 @@ define("file-processing.amd.js", ["exports", "./utils.amd.js", "./structure.amd.
       }
     },
     parse(fileStr) {
-      let molRE = /\n\s*mol\s+(\d+)([\s\S]+)\n\s*endmol\s+\1/g,
+      let molRE = /\n\s*mol\s+(\d+)([\s\S]+)\n\s*endmol\s+\1\b/g,
           atmRE = /^atom\s+\d+\s+.+$/gm,
           result = {
             atoms: [],
@@ -1186,7 +1186,7 @@ define("components/menu.amd.js", ["exports", "jquery", "../eventful.amd.js", "..
     },
     exec(file) {
       if (file) {
-        _fileProcessingAmd2.default.load(file);
+        _fileProcessingAmd2.default.load(file).then(() => _appAmd2.default.trigger("app:structure:loaded"));
       }
     }
   });
@@ -1429,34 +1429,34 @@ define("worker.amd.js", ["exports", "./observer.amd.js", "./app.amd.js"], functi
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {default: obj};
   }
-  let calcWorker = new Worker("js/calc.js");
+  let worker = new Worker("js/calc.js");
   let blockingMethod = "ready";
   _appAmd2.default.busy = true;
-  let worker = Object.assign(new _observerAmd2.default(), {invoke(method, data) {
+  let workerHelper = Object.assign(new _observerAmd2.default(), {invoke(method, data) {
       if (blockingMethod) {
         throw new Error(`Unable to run the method “${method}” as the blocking method “${blockingMethod}” is still running`);
       }
       blockingMethod = method;
       _appAmd2.default.busy = true;
-      calcWorker.postMessage({
+      worker.postMessage({
         method,
         data
       });
     }});
-  calcWorker.addEventListener("message", ({data: {method,
+  worker.addEventListener("message", ({data: {method,
       data} = {}}) => {
     if (method) {
       if (method === blockingMethod) {
         _appAmd2.default.busy = false;
         blockingMethod = null;
       }
-      worker.trigger(method, data);
+      workerHelper.trigger(method, data);
     }
   });
-  calcWorker.addEventListener("error", (e) => {
+  worker.addEventListener("error", (e) => {
     throw e;
   });
-  exports.default = worker;
+  exports.default = workerHelper;
 });
 
 })();
@@ -1517,7 +1517,6 @@ define("structure.amd.js", ["exports", "./observer.amd.js", "./app.amd.js", "./u
       }
       this.trigger("updateStructure", rescanAtoms !== false);
       if (fromWorker !== true) {
-        _appAmd2.default.trigger("app:structure:loaded");
         syncWorker();
       }
     },
@@ -1948,7 +1947,7 @@ define("interface.amd.js", ["./structure.amd.js", "./app.amd.js", "./components/
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {default: obj};
   }
-  _structureAmd2.default.on("app:structure:loaded", () => {
+  _appAmd2.default.on("app:structure:loaded", () => {
     document.title = `${_structureAmd2.default.structure.name} - Open evolver`;
   });
   _appAmd2.default.on("app:stateChange", (busy) => {

dev/css/dialogs/potentials.less

@@ -71,4 +71,9 @@
             width:100%;
         }
     }
+    label,
+    a {
+        display:inline-block;
+        vertical-align:middle;
+    }
 }

dev/css/main.less

@@ -1,6 +1,6 @@
 @import (reference) "ui";
 
-@import (less) "../../vendor/normalize.css";
+@import (less) "../../node_modules/normalize.css/normalize.css";
 
 body {
     font:normal percentage(unit((@root-font-size / 16))) ~"/" unit((@root-line-height / @root-font-size)) @base-font-family;

dev/js/components/menu.js

@@ -104,7 +104,7 @@ app.addAction("load", {
     },
     exec(file) {
         if (file) {
-            fileAPI.load(file);
+            fileAPI.load(file).then(() => app.trigger("app:structure:loaded"));
         }
     }
 });

dev/js/file-processing.js

@@ -27,7 +27,7 @@ formats.hin = {
     },
 
     parse(fileStr) {
-        let molRE = /\n\s*mol\s+(\d+)([\s\S]+)\n\s*endmol\s+\1/g,
+        let molRE = /\n\s*mol\s+(\d+)([\s\S]+)\n\s*endmol\s+\1\b/g,
             atmRE = /^atom\s+\d+\s+.+$/gm,
             result = {atoms: [], bonds: []},
             mol = molRE.exec(fileStr);

dev/js/interface.js

@@ -15,7 +15,7 @@ import "./components/menu.js";
 import "./components/view.js";
 
 
-structure.on("app:structure:loaded", () => {
+app.on("app:structure:loaded", () => {
     document.title = `${structure.structure.name} - Open evolver`;
 });
 

dev/js/structure.js

@@ -109,7 +109,6 @@ let structureUtils = Object.assign(new Observer(), {
         }
         this.trigger("updateStructure", rescanAtoms !== false);
         if (fromWorker !== true) {
-            app.trigger("app:structure:loaded");
             syncWorker();
         }
     },

dev/js/worker.js

@@ -1,31 +1,31 @@
 import Observer from "./observer.js";
 import app from "./app.js";
 
-let calcWorker = new Worker("js/calc.js");
+let worker = new Worker("js/calc.js");
 let blockingMethod = "ready";
 app.busy = true; // calc worker needs some initialization before it can be used
 
-let worker = Object.assign(new Observer(), {
+let workerHelper = Object.assign(new Observer(), {
     invoke(method, data) {
         if (blockingMethod) {
             throw new Error(`Unable to run the method “${method}” as the blocking method “${blockingMethod}” is still running`);
         }
         blockingMethod = method;
         app.busy = true; // note that every worker invocation turns the application into busy state
-        calcWorker.postMessage({method, data});
+        worker.postMessage({method, data});
     }
 });
 
-calcWorker.addEventListener("message", ({data: {method, data} = {}}) => {
+worker.addEventListener("message", ({data: {method, data} = {}}) => {
     if (method) {
         if (method === blockingMethod) {
             app.busy = false;
             blockingMethod = null;
         }
-        worker.trigger(method, data);
+        workerHelper.trigger(method, data);
     }
 });
 
-calcWorker.addEventListener("error", e => {throw e;});
+worker.addEventListener("error", e => {throw e;});
 
-export default worker;
+export default workerHelper;

gulpfile.js

@@ -14,8 +14,7 @@ gulp.task("dependencies", () => {
     let deps = [
         "node_modules/jquery/dist/jquery.min.js",
         "node_modules/systemjs/dist/system.js",
-        "node_modules/three/build/three.min.js",
-        "node_modules/normalize.css/normalize.css"
+        "node_modules/three/build/three.min.js"
     ];
     return gulp.src(deps).pipe(gulp.dest("vendor/"));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-evolver",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Modeling quantum evolution at the nanoscale",
   "author": "Amphiluke",
   "scripts": {
@@ -32,6 +32,6 @@
     "lodash": "^4.17.2",
     "normalize.css": "^5.0.0",
     "systemjs": "^0.19.41",
-    "three": "^0.82.1"
+    "three": "^0.83.0"
   }
 }