Changeset 4464

Timestamp:

01/07/12 14:17:56 (5 months ago)

Author:

tboutell

Message:

New 'prepend' option to aAssets::compileLessIfNeeded() and aAssets::cexecute() specifies LESS code to be prepended to the content of the file to be compiled. This is useful for automatically setting LESS variables based on configuration settings. Needed by PR

Files:

• plugins/apostrophePlugin/branches/1.5/lib/toolkit/BaseaAssets.class.php (modified) (4 diffs)

plugins/apostrophePlugin/branches/1.5/lib/toolkit/BaseaAssets.class.php

@@ -55 +55 @@
    * be used to retrieve the cached array; if you get an array back $info['compiled'] has
    * the compiled CSS code.
+   *
+   * If $options['prepend'] is set it is prepended to the LESS code before compilation.
    */
   static public function compileLessIfNeeded($path, $compiled, $options = array())
@@ -121 +123 @@
     }
     $lastUpdated = is_array($info) ? $info['updated'] : 0;
-    $info = aAssets::cexecute($info, false);
+    
+    $lessOptions = array();
+    if (isset($options['prepend']))
+    {
+      $lessOptions['prepend'] = $options['prepend'];
+    }
+    $info = aAssets::cexecute($info, false, $lessOptions);
                 // Our replacement for cexecute() calls parse() on the contents of a file, so
                 // the cache info structure is missing the name of the original requested file.
@@ -207 +215 @@
          * The cache structure is a plain-ol' PHP associative array and can
          * be serialized and unserialized without a hitch.
+         *
+         * If $options['prepend'] is present that LESS code is prepended before
+         * the compilation.
          * 
          * @param mixed $in Input
-         * @param bool $force Force rebuild?
+         * @param bool $force Force rebuild
+         * @param array $options 
          * @return array lessphp cache structure
          */
-        public static function cexecute($in, $force = false) 
+        public static function cexecute($in, $force = false, $options = array()) 
         {
                 // assume no root
@@ -246 +258 @@
                         $out = array();
                         $out['root'] = $root;
-                        $out['compiled'] = $less->parse(file_get_contents($root));
+                        $code = file_get_contents($root);
+                        if (isset($options['prepend']))
+                        {
+                          $code = $options['prepend'] . "\n" . $code;
+                        }
+                        $out['compiled'] = $less->parse($code);
                         $out['files'] = $less->allParsedFiles();
                         $out['updated'] = time();