From 32b518c8f40b39a4327cd5695617b639f7ffbb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Mon, 28 Sep 2020 09:31:11 +0200
Subject: [PATCH] Add mhchemCE utility

---
 content/dataset.html  | 10 ++--------
 static/js/mhchemCE.js | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 static/js/mhchemCE.js

diff --git a/content/dataset.html b/content/dataset.html
index bec71060..1a1a3075 100644
--- a/content/dataset.html
+++ b/content/dataset.html
@@ -24,6 +24,7 @@ draft: false
 <script src="/js/numberUtils.js"></script>
 <script src="/js/indexDB.js"></script>
 <script src="/js/ArrayExtensions.js"></script>
+<script src="/js/mhchemCE.js"></script>
 <script>
   function adjustSticky() {
     const height = $("nav").height()
@@ -253,13 +254,7 @@ draft: false
             return "Unnamed set"
           }
         case "molecule":
-          const mhchemCE = /^\\ce\{(.*)\}$/
-          const m = value.match(mhchemCE)
-          if (m) {
-            return m[1]
-          } else {
-            return value
-          }
+          return mhchemCE.extract(value)
           break;
         default:
           return value.toString()
@@ -545,7 +540,6 @@ draft: false
         }
         for (const [molecule, moldat] of datadic.entries()) {
           var printmol = true;
-          const mhchemCE = /^\\ce\{.*\}$/
           for (const [jsonex, exdat] of moldat.entries()) {
             const ex = JSON.parse(jsonex)
             Reflect.setPrototypeOf(ex[0], state.prototype)
diff --git a/static/js/mhchemCE.js b/static/js/mhchemCE.js
new file mode 100644
index 00000000..66b04fdf
--- /dev/null
+++ b/static/js/mhchemCE.js
@@ -0,0 +1,16 @@
+class mhchemCE{
+  static extract(string) {
+    const m = string.match(mhchemCE.regEx)
+    if (m) {
+      return m[1]
+    } else {
+      return string
+    }
+  }
+  static test(string){
+    return mhchemCE.regEx.test(string)
+  }
+  static get regEx(){
+    return /^\\ce\{(.*)\}$/
+  }
+}