[Solar-svn] Revision 2876
pmjones at solarphp.com
pmjones at solarphp.com
Sat Oct 13 09:00:41 CDT 2007
updated comments
Modified: trunk/Solar/App/Base/Helper/JsHighlight.php
===================================================================
--- trunk/Solar/App/Base/Helper/JsHighlight.php 2007-10-13 13:53:24 UTC (rev 2875)
+++ trunk/Solar/App/Base/Helper/JsHighlight.php 2007-10-13 14:00:41 UTC (rev 2876)
@@ -70,14 +70,10 @@
* @param string $color A color by word (e.g., "red") or RGB hex (e.g.,
* "#ff0000").
*
- * @param string $callback A jQuery callback to execute when the
- * highlighting is done.
- *
* @return void
*
*/
- public function jsHighlight($sel, $color = "yellow", $speed = "slow",
- $easing = null, $callback = null)
+ public function jsHighlight($sel, $color = "yellow", $speed = "slow")
{
if (is_numeric($speed)) {
$speed = (int) $speed;
@@ -87,6 +83,6 @@
$this->_view
->head()
- ->addScriptInline("\$(\"$sel\").highlight(\"$color\", $speed, \"$easing\", $callback);");
+ ->addScriptInline("\$(\"$sel\").highlight(\"$color\", $speed);");
}
}
\ No newline at end of file
Modified: trunk/Solar/App/Base.php
===================================================================
--- trunk/Solar/App/Base.php 2007-10-13 13:53:24 UTC (rev 2875)
+++ trunk/Solar/App/Base.php 2007-10-13 14:00:41 UTC (rev 2876)
@@ -44,6 +44,13 @@
*/
public $controller;
+ /**
+ *
+ * The name of the layout being used; populated from $this->_layout.
+ *
+ * @var string
+ *
+ */
public $layout;
/**
Modified: trunk/Solar/View/Helper/Head.php
===================================================================
--- trunk/Solar/View/Helper/Head.php 2007-10-13 13:53:24 UTC (rev 2875)
+++ trunk/Solar/View/Helper/Head.php 2007-10-13 14:00:41 UTC (rev 2876)
@@ -225,9 +225,9 @@
* @return Solar_View_Helper_Head
*
*/
- public function setBase($spec)
+ public function setBase($base)
{
- $this->_base = $spec;
+ $this->_base = $base;
return $this;
}
@@ -293,7 +293,7 @@
* Generally used by layouts, not views. If the file has already been
* added, it does not get added again.
*
- * @param string $href The file HREF for the script source.
+ * @param string $src The file HREF for the script source.
*
* @param array $attribs Attributes for the tag.
*
@@ -314,7 +314,7 @@
* Generally used by views, not layouts. If the file has already been
* added, it does not get added again.
*
- * @param string $href The file HREF for the script source.
+ * @param string $src The file HREF for the script source.
*
* @param array $attribs Attributes for the tag.
*
More information about the Solar-svn
mailing list