Changeset 1446

Timestamp:

06/14/06 21:51:36 (2 years ago)

Author:

slickrick

Message:

* Added the ability to remove all javaScripts at once via [-*]
Note: Kept array_diff() separation method for JS since they do not have parameters.

Files:

• branches/slickrick/lib/config/sfViewConfigHandler.class.php (modified) (5 diffs)

branches/slickrick/lib/config/sfViewConfigHandler.class.php

@@ -254 +254 @@
-    foreach ($stylesheets as $stylesheet)
-    {
- 
+  
-      
-      if ($key != '-*')
-      {
-        $omit[] = $key;
- 
+  
-    }
-  }
@@ -270 +270 @@
-    foreach ($stylesheets as $stylesheet)
-    {
- 
- 
+  
+  
-        if (substr($stylesheet, 0, 1) == '-')
-        {
-        $delete[] = substr($stylesheet, 1);
-        }
- 
+  
-    }
-  }
@@ -295 +295 @@
-          if (!in_array($key, $omit))
-          {
- 
+  
-          }
-        }
@@ -304 +304 @@
-          foreach ($delete as $value)
-          {
- 
- 
+  
+  
-              unset($stylesheets[$index]);
- 
+  
-          }
-        }
@@ -338 +338 @@
-    }
-
+    
+    $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;