Changeset 7733

Timestamp:

03/04/08 11:22:41 (6 months ago)

Author:

FabianLange

Message:

added a removeJavascript and removeStylesheet method to sfWebResponse (including unit tests). fixes #1747

Files:

• branches/1.1/lib/response/sfWebResponse.class.php (modified) (3 diffs)
• branches/1.1/test/unit/response/sfWebResponseTest.php (modified) (3 diffs)

branches/1.1/lib/response/sfWebResponse.class.php

@@ -575 +575 @@
-
-  /**
-n
+
-   *
-   * @param string Stylesheet
@@ -589 +589 @@
-
-  /**
+   * Removes a stylesheet from the current web response.
+   *
+   * @param string Stylesheet
+   * @param string Position
+   */
+  public function removeStylesheet($css, $position = '')
+  {
+    $this->validatePosition($position);
+
+    unset($this->stylesheets[$position][$css]);
+  }
+
+  /**
-   * Retrieves javascript code from the current web response.
-   *
@@ -619 +632 @@
-
-    $this->javascripts[$position][$js] = $options;
+  }
+
+  /**
+   * Removes javascript code from the current web response.
+   *
+   * @param string Javascript code
+   * @param string Position
+   */
+  public function removeJavascript($js, $position = '')
+  {
+    $this->validatePosition($position);
+
+    unset($this->javascripts[$position][$js]);
-  }
-

branches/1.1/test/unit/response/sfWebResponseTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-68
+70
-
-class myWebResponse extends sfWebResponse
@@ -208 +208 @@
-$t->is($response->getStylesheets('last'), array('last' => array()), '->getStylesheets() takes a position as its first argument');
-
+$t->diag('->removeStylesheet()');
+$response->removeStylesheet('foo');
+$t->is($response->getStylesheets(), array('test' => array(), 'bar' => array('media' => 'print')), '->getStylesheets() does no longer contain removed stylesheets');
+
-// ->addJavascript()
-$t->diag('->addJavascript()');
@@ -236 +240 @@
-$t->is($response->getJavascripts('last'), array('last_js' => array()), '->getJavascripts() takes a position as its first argument');
-
+$t->diag('->removeJavascript()');
+$response->removeJavascript('test');
+$t->is($response->getJavascripts(), array('foo' => array('raw_name' => true)), '->getJavascripts() does no longer contain removed javascripts');
+
-// ->setCookie() ->getCookies()
-$t->diag('->setCookie() ->getCookies()');