mikuli.cz

commit a017c3d7b6a23b1a4a456d8ee9a295b01196a99a
parent e77e15e9bd4175f882ff4447a4850a35be1ecf26
Author: markseu <mark2011@mayberg.se>
Date:   Tue, 28 Dec 2021 16:04:00 +0100

Updated bundle extension, JS improvement for Giovanni

Diffstat:
M
system/extensions/bundle.php
 | 
13
++++++-------
M
system/extensions/update-current.ini
 | 
4
++--

2 files changed, 8 insertions(+), 9 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.21";
+    const VERSION = "0.8.22";
     public $yellow;         // access to API
 
     // Handle initialisation
@@ -1978,13 +1978,12 @@ class MinifyBasic extends Minify {
     // Minify data, remove only comments and empty lines
     public function execute($path = null) {
         $content = "";
-        $this->extractStrings();
+        $this->extractStrings("\'\"\`");
+        $this->registerPattern("/\/\*.*?\*\//s", "");
+        $this->registerPattern("/\/\/.*?[\r\n]+/", "");
+        $this->registerPattern("/[\r\n]+/", "");
         foreach ($this->data as $source => $data) {
-            $data = $this->replace($data);
-            $data = preg_replace("/\/\*.*?\*\//s", "", $data);
-            $data = preg_replace("/\/\/.*?[\r\n]+/", "", $data);
-            $data = preg_replace("/[\r\n]+/", "\n", $data);
-            $content .= trim($data);
+            $content .= $this->replace($data);
         }
         return $this->restoreExtractedData($content);
     }
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -1,11 +1,11 @@
 # Datenstrom Yellow update settings
 
 Extension: Bundle
-Version: 0.8.21
+Version: 0.8.22
 Description: Bundle website files.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/bundle
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/bundle.zip
-Published: 2021-01-15 17:13:02
+Published: 2021-12-28 15:59:45
 Developer: Datenstrom
 Tag: feature
 system/extensions/bundle.php: bundle.php, create, update