mikuli.cz

commit 37268b75d0144d7003f4b6e4d5eb6d90fb646dbe
parent 367903fd81bb9c71ebf1872cedbb0e73927eb379
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 29 Jul 2020 10:17:13 +0200

Updated bundle extension, JS improvement for Giovanni

Diffstat:
M
system/extensions/bundle.php
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/system/extensions/bundle.php b/system/extensions/bundle.php
@@ -2,7 +2,7 @@
 // Bundle extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/bundle
 
 class YellowBundle {
-    const VERSION = "0.8.14";
+    const VERSION = "0.8.15";
     public $yellow;         // access to API
 
     // Handle initialisation
@@ -1281,7 +1281,8 @@ class CSS extends Minify
             return $placeholder.$rest;
         };
 
-        $this->registerPattern('/calc(\(.+?)(?=$|;|calc\()/', $callback);
+        $this->registerPattern('/calc(\(.+?)(?=$|;|}|calc\()/', $callback);
+        $this->registerPattern('/calc(\(.+?)(?=$|;|}|calc\()/m', $callback);
     }
 
     /**
@@ -1937,6 +1938,11 @@ class MinifyJavaScript extends JS {
         $this->operatorsBefore = array("+", "-", "*", "/", "%", "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=", "&=", "^=", "|=", "&", "|", "^", "~", "<<", ">>", ">>>", "==", "===", "!=", "!==", ">", "<", ">=", "<=", "&&", "||", "!", ".", "[", "?", ":", ",", ";", "(", "{");
         $this->operatorsAfter = array("+", "-", "*", "/", "%", "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=", "&=", "^=", "|=", "&", "|", "^", "<<", ">>", ">>>", "==", "===", "!=", "!==", ">", "<", ">=", "<=", "&&", "||", ".", "[", "]", "?", ":", ",", ";", "(", ")", "}");
     }
+    
+    // Minify data, add semicolon as separator between multiple files
+    public function execute($path = null) {
+        return parent::execute($path).";";
+    }
 }
 
 class MinifyBasic extends Minify {