Changeset 1451

Timestamp:

06/16/06 10:30:42 (2 years ago)

Author:

fabien

Message:

• Fixed bug where stylesheets with parameters (arrays) would not be removed via -stylesheet.
  
• Added ability to remove all stylesheets at once via stylesheets: [-*].
  
• Added the ability to remove all javaScripts at once via [-*]
  

(closes #621 - patch from slickrick)

Files:

• trunk/lib/config/sfViewConfigHandler.class.php (modified) (2 diffs)

trunk/lib/config/sfViewConfigHandler.class.php

@@ -240 +240 @@
-  {
-    $data = array();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $stylesheets = $this->mergeConfigValue('stylesheets', $viewName);
-    if (is_array($stylesheets))
-    {
-
-
-
+
+
-      {
-        $key = is_array($stylesheet) ? key($stylesheet) : $stylesheet;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      foreach ($stylesheets as $css)
@@ -283 +337 @@
-    }
-
+    $omit = array();
+    $delete_all = false;
+
+    // Populate $javascripts with the values from ONLY the current view
+    $javascripts = $this->getConfigValue('javascripts', $viewName);
+
+    // If we find results from the view, check to see if there is a '-*'
+    // This indicates that we will remove ALL javascripts EXCEPT for those passed in the current view
+    if (is_array($javascripts) AND in_array('-*', $javascripts))
+    {
+      $delete_all = true;
+      foreach ($javascripts as $javascript)
+      {     
+        if (substr($javascript, 0, 1) != '-')
+        {
+          $omit[] = $javascript;
+        }
+      }
+    }
+
-    $javascripts = $this->mergeConfigValue('javascripts', $viewName);
-    if (is_array($javascripts))
-    {
-      // remove javascripts marked with a beginning '-'
+      // We exclude any javascripts that were omitted above
-      $delete = array();
+
-      foreach ($javascripts as $javascript)
-      {
-substr($javascript, 0, 1) == '-'
+!in_array($javascript, $omit) && (substr($javascript, 0, 1) == '-' || $delete_all == true)
-        {
-          $delete[] = $javascript;