Changeset 471

Timestamp:

Mar 20, 2014 1:47:43 AM (10 years ago)

Author:

anonymous

Message:

improved css/js strip whitespace methods.

Location:

trunk

Files:

• js/Msg.js (modified) (1 diff)
• lib/CSS.inc.php (modified) (1 diff)
• lib/JS.inc.php (modified) (1 diff)

trunk/js/Msg.js

@@ -95 +95 @@
 Strangecode.Msg.prototype.clear = function() {
     // Append this raised message to the sc-msg stack.
-    msg_class = (typeof msg_class === 'undefined') ? 'sc-msg-error' : msg_class;
+    var msg_class = (typeof msg_class === 'undefined') ? 'sc-msg-error' : msg_class;
     $(this.o.container).find('.sc-js-msg').remove();
 };

trunk/lib/CSS.inc.php

@@ -169 +169 @@
             if ($this->getParam('strip_whitespace')) {
                 // Strip whitespace and print file.
-                echo preg_replace('/[ \t\n\r]+/', ' ', file_get_contents($file, true));
+                echo preg_replace(
+                    array('!/\*.*?\*/!s', '/[\n\r]+/', '/([;:])\s+/m', '/\s*}[ \t]*/', '/\s*{\s*/', '/[ \t\n\r]*,[ \t\n\r]*/', '/^\s+/'),
+                    array('', "\n", '$1', '}', '{', ',', ''), file_get_contents($file, true)
+                );
             } else {
                 // Include file as is.

trunk/lib/JS.inc.php

@@ -169 +169 @@
             if ($this->getParam('strip_whitespace')) {
                 // Strip whitespace and print file.
-                echo preg_replace(array('@^\s*//.*$@m', '@/\*.*?\*/@s', '/[ \t\n\r]+/'), ' ', file_get_contents($file, true));
+                echo preg_replace(
+                    array('!^\s*//.*$!m', '!/\*.*?\*/!s', '/[\n\r]+/', '/[ \t]*}[ \t]*/', '/\s*{\s*/', '/\s*=\s*/', '/^\s+/m'),
+                    array('', '', "\n", '}', '{', '=', ''), file_get_contents($file, true)
+                );
             } else {
                 // Include file as is.