Merge pull request #39 from privrja/test

Test
privrja · Apr 23, 2021 · c60e2ef · c60e2ef
2 parents 40ea6dd + 52042e2
commit c60e2ef
Show file tree

Hide file tree

Showing 44 changed files with 501 additions and 446 deletions.
diff --git a/app.js b/app.js
@@ -49,19 +49,33 @@ SmilesDrawer.apply = function(options, selector='canvas[data-smiles]', themeName
   for (var i = 0; i < elements.length; i++) {
       let element = elements[i];
 
-      SmilesDrawer.parse(element.getAttribute('data-smiles'), function(tree) {
-          smilesDrawer.draw(tree, element, themeName, false);
-      }, function(err) {
-        if (onError) {
-          onError(err);
-        }
-      });
+      let smiles = element.getAttribute('data-smiles');
+      if (!smiles || smiles === '') {
+          const context = element.getContext('2d');
+          context.clearRect(0, 0, element.width, element.height);
+      } else {
+          SmilesDrawer.parse(element.getAttribute('data-smiles'), function (tree) {
+              smilesDrawer.draw(tree, element, themeName, false);
+          }, function (err) {
+              if (onError) {
+                  onError(err);
+              }
+          });
+      }
   }
 };
 
+SmilesDrawer.clear = function(selector = 'canvas[data-smiles]') {
+    let elements = document.querySelectorAll(selector);
+    elements.forEach(canvas => {
+        const context = canvas.getContext('2d');
+        context.clearRect(0, 0, canvas.width, canvas.height);
+    })
+};
+
 /**
 * Parses the entered smiles string.
-* 
+*
 * @static
 * @param {String} smiles A SMILES string.
 * @param {Function} successCallback A callback that is called on success with the parse tree.

diff --git a/dist/smiles-drawer.js b/dist/smiles-drawer.js
@@ -49,18 +49,33 @@ SmilesDrawer.apply = function (options, selector = 'canvas[data-smiles]', themeN
 
   for (var i = 0; i < elements.length; i++) {
     let element = elements[i];
-    SmilesDrawer.parse(element.getAttribute('data-smiles'), function (tree) {
-      smilesDrawer.draw(tree, element, themeName, false);
-    }, function (err) {
-      if (onError) {
-        onError(err);
-      }
-    });
+    let smiles = element.getAttribute('data-smiles');
+
+    if (!smiles || smiles === '') {
+      const context = element.getContext('2d');
+      context.clearRect(0, 0, element.width, element.height);
+    } else {
+      SmilesDrawer.parse(element.getAttribute('data-smiles'), function (tree) {
+        smilesDrawer.draw(tree, element, themeName, false);
+      }, function (err) {
+        if (onError) {
+          onError(err);
+        }
+      });
+    }
   }
 };
+
+SmilesDrawer.clear = function (selector = 'canvas[data-smiles]') {
+  let elements = document.querySelectorAll(selector);
+  elements.forEach(canvas => {
+    const context = canvas.getContext('2d');
+    context.clearRect(0, 0, canvas.width, canvas.height);
+  });
+};
 /**
 * Parses the entered smiles string.
-* 
+*
 * @static
 * @param {String} smiles A SMILES string.
 * @param {Function} successCallback A callback that is called on success with the parse tree.
@@ -2204,6 +2219,12 @@ class Drawer {
       }
     }
   }
+
+  clear() {
+    if (this.canvasWrapper) {
+      this.canvasWrapper.clear();
+    }
+  }
   /**
    * Returns the number of rings this edge is a part of.
    *
@@ -4209,7 +4230,7 @@ class Drawer {
         this.createRing(nextRing, nextCenter, vertex);
       }
     } else {
-      // Draw the non-ring vertices connected to this one  
+      // Draw the non-ring vertices connected to this one
       let isStereoCenter = vertex.value.isStereoCenter;
       let tmpNeighbours = vertex.getNeighbours();
       let neighbours = Array(); // Remove neighbours that are not drawn

diff --git a/dist/smiles-drawer.min.js b/dist/smiles-drawer.min.js
diff --git a/dist/smiles-drawer.min.js.map b/dist/smiles-drawer.min.js.map
diff --git a/doc/ArrayHelper.html b/doc/ArrayHelper.html
@@ -3398,7 +3398,7 @@ <h5>Returns:</h5>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/ArrayHelper.js.html b/doc/ArrayHelper.js.html
@@ -438,7 +438,7 @@ <h1 class="page-title">ArrayHelper.js</h1>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/Atom.html b/doc/Atom.html
@@ -2906,7 +2906,7 @@ <h4 class="name" id="restoreRings"><span class="type-signature"></span>restoreRi
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/Atom.js.html b/doc/Atom.js.html
@@ -594,7 +594,7 @@ <h1 class="page-title">Atom.js</h1>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/CanvasWrapper.html b/doc/CanvasWrapper.html
@@ -3783,7 +3783,7 @@ <h5>Parameters:</h5>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/CanvasWrapper.js.html b/doc/CanvasWrapper.js.html
@@ -948,7 +948,7 @@ <h1 class="page-title">CanvasWrapper.js</h1>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

diff --git a/doc/DecayPoint.js.html b/doc/DecayPoint.js.html
@@ -73,7 +73,7 @@ <h1 class="page-title">DecayPoint.js</h1>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Thu Apr 22 2021 09:00:40 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.5</a> on Fri Apr 23 2021 08:47:34 GMT+0200 (Středoevropský letní čas) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>