Changeset 1018266

Timestamp:

11/02/2014 09:31:27 AM (11 years ago)

Author:

ale.carbo

Message:

Updated trunk to 1.2.3

Location:

assetsminify/trunk

Files:

• AssetsMinifyInit.php (modified) (3 diffs)
• lib/CssMin.php (modified) (5 diffs)
• plugin.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

assetsminify/trunk/AssetsMinifyInit.php

@@ -129 +129 @@
 
         $file_path = false;
+        $wp_plugin_url = plugins_url();
+        $wp_content_url = content_url();
 
         // Script is enqueued from a plugin
-        if( strpos($file_url, WP_PLUGIN_URL) !== false )
-            $file_path = WP_PLUGIN_DIR . str_replace(WP_PLUGIN_URL, '', $file_url);
+
+        $url_regex = $this->getUrlRegex($wp_plugin_url);
+        if( preg_match($url_regex, $file_url) > 0 )
+            $file_path = WP_PLUGIN_DIR . preg_replace($url_regex, '', $file_url);
 
         // Script is enqueued from a theme
-        if( strpos($file_url, WP_CONTENT_URL) !== false )
-            $file_path = WP_CONTENT_DIR . str_replace(WP_CONTENT_URL, '', $file_url);
+        $url_regex = $this->getUrlRegex($wp_content_url);
+        if( preg_match($url_regex, $file_url) > 0 )
+            $file_path = WP_CONTENT_DIR . preg_replace($url_regex, '', $file_url);
 
         // Script is enqueued from wordpress
@@ -144 +149 @@
         return $file_path;
     }
+    
+    /**
+     * Returns Regular Expression string to match an URL.
+     *
+     * @param string $url The URL to be matched.
+     * @return string The regular expression matching the URL.
+     */
+    protected function getUrlRegex( $url ) {
+        $regex  = '@^' . str_replace( 'http\://','https?\:\/\/', preg_quote( $url )) . '@';
+        return $regex;
+    }
+    
 
     /**
@@ -185 +202 @@
             //Unfortunately not every WP plugin developer is a JS ninja
             //So... let's put it in the header.
-            if ( empty($wp_scripts->registered[$handle]->extra) )
+            if ( empty($wp_scripts->registered[$handle]->extra) && empty($wp_scripts->registered[$handle]->args) )
                 $where = 'header';
 

assetsminify/trunk/lib/CssMin.php

@@ -466 +466 @@
             elseif ($class === "CssAtKeyframesStartToken")
                 {
-                $r[] = $indent . "@keyframes \"" . $token->Name . "\"";
+                $r[] = $indent . "@keyframes " . $token->Name . "";
                 $r[] = $this->indent . $indent . "{";
                 $level++;
@@ -1841 +1841 @@
             elseif ($class === "CssAtKeyframesStartToken")
                 {
-                $r[] = $indent . "@keyframes \"" . $token->Name . "\" {";
+                $r[] = $indent . "@keyframes " . $token->Name . " {";
                 $level++;
                 }
@@ -3326 +3326 @@
         {
         $r = 0;
-        $transformations = array("-moz-keyframes", "-webkit-keyframes");
+        $transformations = array("-moz-keyframes", "-webkit-keyframes", "-o-keyframes", "-ms-keyframes");
         for ($i = 0, $l = count($tokens); $i < $l; $i++)
             {
@@ -4436 +4436 @@
     public function __toString()
         {
-        return "@" . $this->AtRuleName . " \"" . $this->Name . "\"{";
+            return "@" . $this->AtRuleName . " " . $this->Name . "{";
         }
     }
@@ -4575 +4575 @@
             return $index + 15;
             }
+        // Start of @keyframes at-rule block (@-ms-keyframes)
+        else if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 14)) === "@-ms-keyframes")
+            {
+            $this->atRuleName = "-ms-keyframes";
+            $this->parser->pushState("T_AT_KEYFRAMES::NAME");
+            $this->parser->clearBuffer();
+            return $index + 14;
+            }
+        // Start of @keyframes at-rule block (@-o-keyframes)
+        else if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 13)) === "@-o-keyframes")
+            {
+            $this->atRuleName = "-o-keyframes";
+            $this->parser->pushState("T_AT_KEYFRAMES::NAME");
+            $this->parser->clearBuffer();
+            return $index + 13;
+            }                       
         // Start of @keyframes at-rule block (@-webkit-keyframes)
         elseif ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 18)) === "@-webkit-keyframes")

assetsminify/trunk/plugin.php

@@ -5 +5 @@
 Description: WordPress plugin to minify JS and CSS assets.
 Author: Alessandro Carbone
-Version: 1.2.2
+Version: 1.2.3
 Author URI: http://www.artera.it
 */

assetsminify/trunk/readme.txt

@@ -4 +4 @@
 Tags: assets, minify, css, js, less, sass, compass, coffeescript
 Requires at least: 3.3
-Tested up to: 3.8
+Tested up to: 4.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Stable tag: 1.2.2
+Stable tag: 1.2.3
 
 Use Compass, SASS, LESS and CoffeeScript (NEW) to develop your themes and minify your stylesheets and JavaScript simply by installing AssetsMinify.
@@ -61 +61 @@
 == Changelog ==
 
+= 1.2.3 =
+
+* SSL and keyframes bugfix thanks @pepe - http://mundschenk.at/
+
 = 1.2.2 =