Parcourir la source

#170 only JS files must be wrapped in curly braces

Alex Trofimov il y a 11 ans
Parent
commit
f5906cfeb2
1 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 4 3
      inc/classes/BxDolTemplate.php

+ 4 - 3
inc/classes/BxDolTemplate.php

@@ -1286,7 +1286,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
      */
 	function _minifyJs($s)
     {
-    	return BxDolMinify::getInstance()->minifyJs($s);
+        // since each JS file is minified separately, it has to be in own scope
+    	return "\n {\n" . BxDolMinify::getInstance()->minifyJs($s) . "\n }\n";
     }
 
     /**
@@ -1575,8 +1576,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
 
             if (!preg_match('/[\.-]min.(js|css)$/i', $aFile['path']) && $this->{'_b' . $sUpcaseType . 'Minify'}) // don't minify minified files
                 $sContent = $this->$sMethodMinify($sContent);
-
-            $sResult .= "\n {\n" . $sContent . "\n }\n"; // since each file is minified separately, it needs to be in own scope
+            
+            $sResult .= $sContent;
         }
 
         $mixedWriteResult = false;