Added BundleOn toggle.

Author: Lars Nyström

BundlePhu/View/Helper/BundleLink.php

@@ -117,6 +117,13 @@ class BundlePhu_View_Helper_BundleLink extends Zend_View_Helper_HeadLink
      * @var callback
      */
     protected $_minifyCallback;
+    
+    /**
+     * Toggle, whether to bundle or not.
+     *
+     * @var bundleOn
+     */
+    protected $_bundleOn = true;
 
     public function setView(Zend_View_Interface $view) {
         $this->view = $view;
@@ -273,6 +280,18 @@ public function setGzipEncoding($encodingMode)
         $this->_gzipEncoding = $encodingMode;
         return $this;
     }
+    
+    /**
+     * Turn off or on bundling
+     *
+     * @param boolean $bundle True to bundle, false otherwise.
+     * @return BundlePhu_View_Helper_BundleLink $this
+     */
+    public function setBundleOn($bundle)
+    {
+        $this->_bundleOn = (bool) $bundle;
+        return $this;
+    }
 
     /**
      * Iterates over stylesheets, concatenating, optionally minifying,
@@ -290,7 +309,7 @@ public function setGzipEncoding($encodingMode)
      */
     public function toString($indent = null)
     {
-        if (isset($_REQUEST['bundle_off'])) {
+        if (false == $this->_bundleOn || isset($_REQUEST['bundle_off'])) {
             return parent::toString($indent);
         }
 
@@ -402,4 +421,4 @@ protected function _writeCompressed($cacheFile, $data)
         $data = gzencode($data, $this->_gzipLevel);
         file_put_contents("$cacheFile.gz", $data);
     }
-}
+}

BundlePhu/View/Helper/BundleScript.php

@@ -118,6 +118,13 @@ class BundlePhu_View_Helper_BundleScript extends Zend_View_Helper_HeadScript
      * @var callback
      */
     protected $_minifyCallback;
+    
+    /**
+     * Toggle, whether to bundle or not.
+     *
+     * @var bundleOn
+     */
+    protected $_bundleOn = true;
 
     public function setView(Zend_View_Interface $view)
     {
@@ -275,7 +282,19 @@ public function setGzipEncoding($encodingMode)
         $this->_gzipEncoding = $encodingMode;
         return $this;
     }
-
+    
+    /**
+     * Turn off or on bundling
+     *
+     * @param boolean $bundle True to bundle, false otherwise.
+     * @return BundlePhu_View_Helper_BundleLink $this
+     */
+    public function setBundleOn($bundle)
+    {
+        $this->_bundleOn = (bool) $bundle;
+        return $this;
+    }
+    
     /**
      * Iterates over scripts, concatenating, optionally minifying, 
      * optionally compressiong, and caching them.
@@ -295,7 +314,7 @@ public function setGzipEncoding($encodingMode)
      */
     public function toString($indent = null)
     {
-        if (isset($_REQUEST['bundle_off'])) {
+        if (false == $this->_bundleOn || isset($_REQUEST['bundle_off'])) {
             return parent::toString($indent);
         }
 
@@ -415,4 +434,4 @@ protected function _writeCompressed($cacheFile, $data)
         $data = gzencode($data, $this->_gzipLevel);
         file_put_contents("$cacheFile.gz", $data);
     }
-}
+}