Made inline utility methods to replace it being done in helpers

heristop · Dec 9, 2010 · ae62c95 · ae62c95
1 parent 4b2fa05
commit ae62c95
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 43 deletions.
diff --git a/lib/helper/sfCombineHelper.php b/lib/helper/sfCombineHelper.php
@@ -365,28 +365,7 @@ function javascript_tag_minified($content = null)
   else
   {
     // minify content
-    $config = sfConfig::get('app_sfCombinePlugin_js', array());
-
-    $combinerClass = isset($config['combiner_class'])
-      ? $config['combiner_class']
-      : 'sfCombineCombinerJs'
-    ;
-
-    $combiner = new $combinerClass(
-      $config
-    );
-
-    $content = $combiner->minify(
-      $content,
-      (isset($config['inline_minify_method']) 
-        ? $config['inline_minify_method'] 
-        : false
-      ),
-      (isset($config['inline_minify_method_options']) 
-        ? $config['inline_minify_method_options'] 
-        : array()
-      )
-    );
+    $content = sfCombineUtility::minifyInlineJs($content);
 
     return javascript_tag($content);
   }
@@ -418,28 +397,9 @@ function style_tag_minified($content = null, array $elementOptions = array())
   else
   {
     // minify content
-    $config = sfConfig::get('app_sfCombinePlugin_css', array());
-    $combinerClass = isset($config['combiner_class'])
-                   ? $config['combiner_class']
-                   : 'sfCombineCombinerCss';
-
-    $combiner = new $combinerClass(
-      $config
-    );
-
-    $content = $combiner->minify(
-      $content,
-      (isset($config['inline_minify_method'])
-        ? $config['inline_minify_method']
-        : false
-      ),
-      (isset($config['inline_minify_method_options'])
-        ? $config['inline_minify_method_options']
-        : array()
-      )
-    );
+    $content = sfCombineUtility::minifyInlineCss($content);
 
-    if (!isset($elementOptionsp['type']))
+    if (!isset($elementOptions['type']))
     {
       $elementOptions['type'] = 'text/css';
     }

diff --git a/lib/sfCombineUtility.class.php b/lib/sfCombineUtility.class.php
@@ -200,4 +200,79 @@ static protected function _checkGzipFail()
 
     return $version < 6 || ($version == 6 && strpos($userAgent, 'SV1') === false);
   }
+
+  /**
+   *
+   * @param   string  $js
+   * @return  string
+   */
+  static public function minifyInlineJs($js)
+  {
+    if (!sfConfig::get('app_sfCombinePlugin_enabled', false))
+    {
+      return $js;
+    }
+
+    // minify content
+    $config = sfConfig::get('app_sfCombinePlugin_js', array());
+
+    $combinerClass = isset($config['combiner_class'])
+      ? $config['combiner_class']
+      : 'sfCombineCombinerJs'
+    ;
+
+    $combiner = new $combinerClass(
+      $config
+    );
+
+    $js = $combiner->minify(
+      $js,
+      (isset($config['inline_minify_method'])
+        ? $config['inline_minify_method']
+        : false
+      ),
+      (isset($config['inline_minify_method_options'])
+        ? $config['inline_minify_method_options']
+        : array()
+      )
+    );
+
+    return $js;
+  }
+
+  /**
+   *
+   * @param   string  $css
+   * @return  string
+   */
+  static public function minifyInlineCss($css)
+  {
+    if (!sfConfig::get('app_sfCombinePlugin_enabled', false))
+    {
+      return $css;
+    }
+
+    $config = sfConfig::get('app_sfCombinePlugin_css', array());
+    $combinerClass = isset($config['combiner_class'])
+                   ? $config['combiner_class']
+                   : 'sfCombineCombinerCss';
+
+    $combiner = new $combinerClass(
+      $config
+    );
+
+    $css = $combiner->minify(
+      $css,
+      (isset($config['inline_minify_method'])
+        ? $config['inline_minify_method']
+        : false
+      ),
+      (isset($config['inline_minify_method_options'])
+        ? $config['inline_minify_method_options']
+        : array()
+      )
+    );
+
+    return $css;
+  }
 }