summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-07-24 22:37:43 +0200
committerAndrey Andreev <narf@devilix.net>2013-07-24 22:37:43 +0200
commit45a4544ba38d654d87e3a9664b483bd5758d42d1 (patch)
treef336cff051bdfd620cfb7fe6d2d86f7bdca0b81d
parent28769988ee2a86e2d8c1863690355dc6bf368666 (diff)
parent3b8b892d8093bfc5f6b6b54c77878eb591eaf6c4 (diff)
Merge pull request #2556 from vlakoff/develop-4
Fixes in JavaScript Library
-rw-r--r--system/libraries/Javascript.php4
-rw-r--r--system/libraries/Javascript/Jquery.php3
2 files changed, 3 insertions, 4 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 090f4c90e..26a16850c 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -172,7 +172,7 @@ class CI_Javascript {
*/
public function focus($element = 'this', $js = '')
{
- return $this->js->__add_event($element, $js);
+ return $this->js->_focus($element, $js);
}
// --------------------------------------------------------------------
@@ -189,7 +189,7 @@ class CI_Javascript {
*/
public function hover($element = 'this', $over = '', $out = '')
{
- return $this->js->__hover($element, $over, $out);
+ return $this->js->_hover($element, $over, $out);
}
// --------------------------------------------------------------------
diff --git a/system/libraries/Javascript/Jquery.php b/system/libraries/Javascript/Jquery.php
index f5fa72d30..ab78e8b2e 100644
--- a/system/libraries/Javascript/Jquery.php
+++ b/system/libraries/Javascript/Jquery.php
@@ -923,7 +923,6 @@ class CI_Jquery extends CI_Javascript {
if (is_array($js))
{
$js = implode("\n\t\t", $js);
-
}
$event = "\n\t$(".$this->_prep_element($element).').'.$event."(function(){\n\t\t{$js}\n\t});\n";
@@ -937,7 +936,7 @@ class CI_Jquery extends CI_Javascript {
* Compile
*
* As events are specified, they are stored in an array
- * This funciton compiles them all for output on a page
+ * This function compiles them all for output on a page
*
* @param string $view_var
* @param bool $script_tags