Changeset 3882:254f3929b2c4

Timestamp:

09/19/18 10:11:05 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Actually the minifier did not like the template strings, so one step back (see rev [3881]) and fix the minifier

Files:

• admin/js/common.js (modified) (1 diff)
• build-tools/Minifier.php (modified) (18 diffs)

admin/js/common.js

@@ -525 +525 @@
     if (!opt.remove && opt.value !== null) {
       // Compose badge classes
-      const cls = `badge badge-${opt.id} ${opt.inline ? 'badge-inline' : 'badge-block'}${opt.icon ? ' badge-icon' : ''}${opt.type !== '' ? ` badge-${opt.type}` : ''}${opt.left ? ' badge-left' : ''}${opt.noborder ? ' badge-noborder' : ''}${opt.small ? ' badge-small' : ''}${opt.classes !== '' ? ` ${opt.classes}` : ''}`;
+      const cls = `badge badge-${opt.id} \
+${opt.inline ? 'badge-inline' : 'badge-block'}\
+${opt.icon ? ' badge-icon' : ''}\
+${opt.type !== '' ? ` badge-${opt.type}` : ''}\
+${opt.left ? ' badge-left' : ''}\
+${opt.noborder ? ' badge-noborder' : ''}\
+${opt.small ? ' badge-small' : ''}\
+${opt.classes !== '' ? ` ${opt.classes}` : ''}`;
       // Compose badge
       const xml = `<span class="${cls}" aria-hidden="true">${opt.value}</span>`;

build-tools/Minifier.php

@@ -107 +107 @@
 
             $jshrink = new Minifier();
-            $js = $jshrink->lock($js);
+            $js      = $jshrink->lock($js);
             $jshrink->minifyDirectToOutput($js, $options);
 
@@ -155 +155 @@
     {
         $this->options = array_merge(static::$defaultOptions, $options);
-        $js = str_replace("\r\n", "\n", $js);
-        $js = str_replace('/**/', '', $js);
-        $this->input = str_replace("\r", "\n", $js);
+        $js            = str_replace("\r\n", "\n", $js);
+        $js            = str_replace('/**/', '', $js);
+        $this->input   = str_replace("\r", "\n", $js);
 
         // We add a newline to the end of the script to make it easier to deal
@@ -190 +190 @@
                     // if B is a space we skip the rest of the switch block and go down to the
                     // string/regex check below, resetting $this->b with getReal
-                    if($this->b === ' ')
+                    if ($this->b === ' ') {
                         break;
+                    }
 
                 // otherwise we treat the newline like a space
 
                 case ' ':
-                    if(static::isAlphaNumeric($this->b))
+                    if (static::isAlphaNumeric($this->b)) {
                         echo $this->a;
+                    }
 
                     $this->saveString();
@@ -205 +207 @@
                     switch ($this->b) {
                         case "\n":
-                            if (strpos('}])+-"\'', $this->a) !== false) {
+                            if (strpos('}])+-"\'`', $this->a) !== false) {
                                 echo $this->a;
                                 $this->saveString();
@@ -218 +220 @@
 
                         case ' ':
-                            if(!static::isAlphaNumeric($this->a))
+                            if (!static::isAlphaNumeric($this->a)) {
                                 break;
+                            }
 
                         default:
                             // check for some regex that breaks stuff
-                            if ($this->a === '/' && ($this->b === '\'' || $this->b === '"')) {
+                            if ($this->a === '/' && ($this->b === '\'' || $this->b === '"' || $this->b === '`')) {
                                 $this->saveRegex();
                                 continue;
@@ -237 +240 @@
             $this->b = $this->getReal();
 
-            if(($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false))
+            if (($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false)) {
                 $this->saveRegex();
+            }
+
         }
     }
@@ -251 +256 @@
         unset($this->input);
         $this->index = 0;
-        $this->a = $this->b = '';
+        $this->a     = $this->b     = '';
         unset($this->c);
         unset($this->options);
@@ -268 +273 @@
             unset($this->c);
 
-        // Otherwise we start pulling from the input.
+            // Otherwise we start pulling from the input.
         } else {
             $char = substr($this->input, $this->index, 1);
@@ -283 +288 @@
         // Normalize all whitespace except for the newline character into a
         // standard space.
-        if($char !== "\n" && ord($char) < 32)
-
+        if ($char !== "\n" && ord($char) < 32) {
             return ' ';
+        }
 
         return $char;
@@ -303 +308 @@
     {
         $startIndex = $this->index;
-        $char = $this->getChar();
+        $char       = $this->getChar();
 
         // Check to see if we're potentially in a comment
@@ -365 +370 @@
         if ($this->getNext('*/')) {
 
-            $this->getChar(); // get *
-            $this->getChar(); // get /
+            $this->getChar();         // get *
+            $this->getChar();         // get /
             $char = $this->getChar(); // get next real character
 
             // Now we reinsert conditional comments and YUI-style licensing comments
             if (($this->options['flaggedComments'] && $thirdCommentString === '!')
-                || ($thirdCommentString === '@') ) {
+                || ($thirdCommentString === '@')) {
 
                 // If conditional comments or flagged comments are not the first thing in the script
@@ -395 +400 @@
         }
 
-        if($char === false)
+        if ($char === false) {
             throw new \RuntimeException('Unclosed multiline comment at position: ' . ($this->index - 2));
+        }
 
         // if we're here c is part of the comment and therefore tossed
-        if(isset($this->c))
+        if (isset($this->c)) {
             unset($this->c);
+        }
 
         return $char;
@@ -419 +426 @@
 
         // If it's not there return false.
-        if($pos === false)
-
+        if ($pos === false) {
             return false;
+        }
 
         // Adjust position of index to jump ahead to the asked for string
@@ -445 +452 @@
 
         // If this isn't a string we don't need to do anything.
-        if ($this->a !== "'" && $this->a !== '"') {
+        if ($this->a !== "'" && $this->a !== '"' && $this->a !== '`') {
             return;
         }
 
-        // String type is the quote used, " or '
+        // String type is the quote used, " or ' or `
         $stringType = $this->a;
 
@@ -474 +481 @@
                 // block below.
                 case "\n":
-                    throw new \RuntimeException('Unclosed string at position: ' . $startpos );
+                    throw new \RuntimeException('Unclosed string at position: ' . $startpos);
                     break;
 
@@ -494 +501 @@
                     break;
 
-
                 // Since we're not dealing with any special cases we simply
                 // output the character and continue our loop.
@@ -514 +520 @@
 
         while (($this->a = $this->getChar()) !== false) {
-            if($this->a === '/')
+            if ($this->a === '/') {
                 break;
+            }
 
             if ($this->a === '\\') {
@@ -522 +529 @@
             }
 
-            if($this->a === "\n")
+            if ($this->a === "\n") {
                 throw new \RuntimeException('Unclosed regex pattern at position: ' . $this->index);
+            }
 
             echo $this->a;