Merge branch 'master' of http://github.com/vicb/sfLESSPlugin

everzet · Jul 26, 2010 · 28987f9 · 28987f9
2 parents 50bf494 + 795452f
commit 28987f9
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 10 deletions.
diff --git a/config/sfLESSPluginConfiguration.class.php b/config/sfLESSPluginConfiguration.class.php
@@ -42,5 +42,10 @@ public function initialize()
         ));
       }
     }
+
+    $this->dispatcher->connect(
+      'less_js.compile',
+      array('sfLESSListeners', 'findAndFixContentLinks')
+    );
   }
 }
diff --git a/lib/config/LESSConfig.class.php b/lib/config/LESSConfig.class.php
@@ -32,6 +32,14 @@ class LESSConfig
    */
   protected $useCompression;
 
+  /**
+   * Client side compilation
+   *
+   * @var boolean
+   */
+  protected $compileClientSide = false;
+
+
   /**
    * Creates config instance
    *
@@ -114,6 +122,24 @@ public function getLessJsPath()
     return '/sfLESSPlugin/js/less-1.0.31.min.js';
   }
 
+  /**
+   * @return  boolean  Wether to compile on the client side
+   */
+  public function isClientSideCompilation()
+  {
+    return $this->compileClientSide;
+  }
+
+  /**
+   * Enable the client side compilation
+   *
+   * @param   boolean $clientSide Wether to compile on the client side
+   */
+  public function setIsClientSideCompilation($clientSide)
+  {
+    $this->compileClientSide = $clientSide;
+  }
+
   /**
    * Returns debug info of the current state
    *

diff --git a/lib/config/sfLESSConfig.class.php b/lib/config/sfLESSConfig.class.php
@@ -57,4 +57,12 @@ public function getLessJsPath()
   {
     return sfConfig::get('app_sf_less_plugin_js_lib', parent::getLessJsPath());
   }
+
+  /**
+   * @see LESSConfig
+   */
+  public function isClientSideCompilation()
+  {
+    sfConfig::get('app_sf_less_plugin_use_js', parent::isClientSideCompilation());
+  }
 }
diff --git a/lib/helper/LESSHelper.php b/lib/helper/LESSHelper.php
@@ -32,9 +32,8 @@ function get_less_stylesheets()
 {
   $response = sfContext::getInstance()->getResponse();
 
-  sfLESSListeners::findAndFixContentLinks(
+  $dispatcher = sfContext::getInstance()->getEventDispatcher();
-    $response, sfConfig::get('app_sf_less_plugin_use_js', false)
+  $dispatcher->notify(new sfEvent($response, 'less_js.compile'));
-  );
 
   return get_stylesheets();
 }

diff --git a/lib/less/sfLESSListeners.php b/lib/less/sfLESSListeners.php
@@ -21,13 +21,14 @@ class sfLESSListeners
   /**
    * Update the response by fixing less stylesheet path and adding the less js engine when required
    *
-   * @param   sfWebResponse $response The response that will be sent back to the browser
+   * @param   sfEvent       $event    An sfEvent instance
-   * @param   boolean       $useJs    Wether the less stylesheets should be processed by the js on the client side
    */
-  static public function findAndFixContentLinks(sfWebResponse $response, $useJs)
+  static public function findAndFixContentLinks(sfEvent $event)
   {
+    $response = $event->getSubject();
+    $config = new sfLESSConfig();
     $hasLess  = false;
-
+    
     foreach ($response->getStylesheets() as $file => $options)
     {
       if (
@@ -36,7 +37,7 @@ static public function findAndFixContentLinks(sfWebResponse $response, $useJs)
          )
       {
         $response->removeStylesheet($file);
-        if ($useJs)
+        if ($config->isClientSideCompilation())
         {
           $response->addStylesheet(
             '/less/' . $file, '', array_merge($options, array('rel' => 'stylesheet/less'))
@@ -59,8 +60,7 @@ static public function findAndFixContentLinks(sfWebResponse $response, $useJs)
         );
       }
       else
-      {
+      {        
-        $config = new sfLESSConfig();
         $response->addJavascript($config->getLessJsPath());
       }
     }