Merge branch '1.3-jshelper' of git@thechaw.com:cakephp into 1.3-jshelper

Conflicts:
	cake/libs/view/helpers/jquery_engine.php
	cake/libs/view/helpers/js.php
This commit is contained in:
mark_story 2009-04-26 23:28:05 -04:00
commit 5bdd5560b7

View file

@ -232,12 +232,13 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
$template = '%s.droppable({%s});';
return $this->_methodTemplate('drop', $template, $options, $callbacks);
}
/**
* Slider
* Create a Slider element
*
* Requires both Ui.Core and Ui.Slider to be loaded.
*
* Requires the Ui.Core and Ui.Slider to be loaded.
*
* @param array $options Array of options for the slider element.
* @param array $options Array of options for the droppable element.
* @return string Completed Slider script.
* @see JsHelper::slider() for options list.
**/