different toString patch

matiasvlevi · Apr 29, 2022 · 0df2ed5 · 0df2ed5
1 parent cae7de6
commit 0df2ed5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
 ## Installation
 ### CDN :
 ```html
-<script src="https://cdn.jsdelivr.net/gh/matiasvlevi/dann@v2.4.1d/build/dann.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/matiasvlevi/dann@v2.4.1e/build/dann.min.js"></script>
 ```
 ### Node :
 ```

diff --git a/build/dann.js b/build/dann.js
@@ -1,6 +1,6 @@
 /*! Dann.js */
 const isBrowser = typeof process !== 'object';
-const VERSION = 'v2.4.1d';
+const VERSION = 'v2.4.1e';
 
 /*
  * Undisplayed documentation
@@ -2894,7 +2894,7 @@ Dann.prototype.toFunction = function toFunction(name = 'myDannFunction') {
   for (let i = 1; i < this.Layers.length; i++) {
     let actname = this.Layers[i].actname;
     if (i !== 0) {
-      let actfunc = toES6(minify(activations[actname].toString()));
+      let actfunc = toES6(activations[actname].toString());
       let minfunction = '';
       for (let u = 0; u < actfunc.length; u++) {
         minfunction += actfunc[u];
@@ -3028,7 +3028,7 @@ function toES6(fn) {
   if (isES6(fn)) return fn;
 
   let args = fn.match(/\(.*?\)/gm)[0];
-  let matches = fn.match(/{.*?}/);
+  let matches = fn.split('\r').join('').split('\n').join('').match(/{.*?}/);
   let implementation = '';
 
   if (matches !== null) {

diff --git a/build/dann.min.js b/build/dann.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "_from": "dannjs",
-  "_id": "dannjs@2.4.1d",
+  "_id": "dannjs@2.4.1e",
   "_inBundle": false,
   "_integrity": "sha512-+Do7tE1EtLn/UMqyIy0V6dgLo43Wq6tj2vAY8oZTMHAY+ysYLJ2sT32H9DgZViL/B59XTIKN6BO8WEbn5pv8XA==",
   "_location": "/dannjs",
@@ -56,7 +56,7 @@
     "doc-server": "node docs/serve.js",
     "makechangelog": "grunt makechangelog"
   },
-  "version": "2.4.1d",
+  "version": "2.4.1e",
   "keywords": [
     "dann",
     "dannjs",

diff --git a/src/classes/dann/methods/Share/toFunction.js b/src/classes/dann/methods/Share/toFunction.js
@@ -37,7 +37,7 @@ Dann.prototype.toFunction = function toFunction(name = 'myDannFunction') {
   for (let i = 1; i < this.Layers.length; i++) {
     let actname = this.Layers[i].actname;
     if (i !== 0) {
-      let actfunc = toES6(minify(activations[actname].toString()));
+      let actfunc = toES6(activations[actname].toString());
       let minfunction = '';
       for (let u = 0; u < actfunc.length; u++) {
         minfunction += actfunc[u];
@@ -171,7 +171,7 @@ function toES6(fn) {
   if (isES6(fn)) return fn;
 
   let args = fn.match(/\(.*?\)/gm)[0];
-  let matches = fn.match(/{.*?}/);
+  let matches = fn.split('\r').join('').split('\n').join('').match(/{.*?}/);
   let implementation = '';
 
   if (matches !== null) {

diff --git a/src/io/head.js b/src/io/head.js
@@ -1,3 +1,3 @@
 /*! Dann.js */
 const isBrowser = typeof process !== 'object';
-const VERSION = 'v2.4.1d';
+const VERSION = 'v2.4.1e';
diff --git a/test/manual-tests/browser/binarycount-example/browser.html b/test/manual-tests/browser/binarycount-example/browser.html
@@ -9,7 +9,7 @@
         <header class="main-header" style="text-align: left;">
             <div class="content" style="top:16px;margin:0;">
                 <div class="project-title"  style="transition: none;position:absolute;padding:0px;margin-left: 30px">
-                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1d</span>
+                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1e</span>
                         <h3 style="margin-top:0px;margin-left:7px;font-size: 11px;">Browser Test</h3>
                 </div>
             </div>

diff --git a/test/manual-tests/browser/empty-example/browser.html b/test/manual-tests/browser/empty-example/browser.html
@@ -9,7 +9,7 @@
         <header class="main-header" style="text-align: left;">
             <div class="content" style="top:16px;margin:0;">
                 <div class="project-title"  style="transition: none;position:absolute;padding:0px;margin-left: 30px">
-                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1d</span>
+                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1e</span>
                         <h3 style="margin-top:0px;margin-left:7px;font-size: 11px;">Browser Test</h3>
                 </div>
             </div>

diff --git a/test/manual-tests/browser/xor-example/browser.html b/test/manual-tests/browser/xor-example/browser.html
@@ -9,7 +9,7 @@
         <header class="main-header" style="text-align: left;">
             <div class="content" style="top:16px;margin:0;">
                 <div class="project-title"  style="transition: none;position:absolute;padding:0px;margin-left: 30px">
-                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1d</span>
+                        <h1 class="project-name">Dannjs</h1> <span class="project-version">2.4.1e</span>
                         <h3 style="margin-top:0px;margin-left:7px;font-size: 11px;">Browser Test</h3>
                 </div>
             </div>