summaryrefslogtreecommitdiffstats
path: root/system/libraries/Javascript/Jquery.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-07-17 19:08:33 +0200
committerAndrey Andreev <narf@devilix.net>2013-07-17 19:08:33 +0200
commit903f31bd683084d96909f2b14acadfe5c34b4c41 (patch)
tree3700f16dfc788bb4ae05ce05912754564565ab00 /system/libraries/Javascript/Jquery.php
parente18de50dc1a4369aef18df9b368f8bfb0f9177d9 (diff)
parent164a1f28dd8f8093d260748e0d85fa714f232a57 (diff)
Merge pull request #2447 from rlerdorf/develop
A few minor fixes and cleanups
Diffstat (limited to 'system/libraries/Javascript/Jquery.php')
-rw-r--r--system/libraries/Javascript/Jquery.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Javascript/Jquery.php b/system/libraries/Javascript/Jquery.php
index b6e0434b2..2b0cc08e6 100644
--- a/system/libraries/Javascript/Jquery.php
+++ b/system/libraries/Javascript/Jquery.php
@@ -225,7 +225,7 @@ class CI_Jquery extends CI_Javascript {
* @param string - Javascript code for mouse out
* @return string
*/
- protected function _hover($element = 'this', $over, $out)
+ protected function _hover($element = 'this', $over = '', $out = '')
{
$event = "\n\t$(".$this->_prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
@@ -715,7 +715,7 @@ class CI_Jquery extends CI_Javascript {
* @return string
*/
- protected function _updater($container = 'this', $controller, $options = '')
+ protected function _updater($container = 'this', $controller = '', $options = '')
{
$container = $this->_prep_element($container);
$controller = (strpos('://', $controller) === FALSE) ? $controller : $this->CI->config->site_url($controller);
@@ -1066,4 +1066,4 @@ class CI_Jquery extends CI_Javascript {
}
/* End of file Jquery.php */
-/* Location: ./system/libraries/Jquery.php */ \ No newline at end of file
+/* Location: ./system/libraries/Jquery.php */