summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-03-03 19:26:31 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-03-03 19:26:31 +0100
commitaacfe480da6859cd74b70884de34d987c6682267 (patch)
tree1d0720b4411d6b8da4694f159c4e7359e8e5a483
parent626d39f92bb9185ea85daafd6679529d054b85ab (diff)
Moving Jquery library to javascript/Jquery.php
-rw-r--r--system/libraries/Javascript.php2
-rw-r--r--system/libraries/javascript/Jquery.php (renamed from system/libraries/Jquery.php)2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 3b7dcc6ff..af85e6509 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -23,7 +23,7 @@ class CI_Javascript {
$this->CI =& get_instance();
// load the requested js library
- $this->CI->load->library($js_library_driver, array('autoload' => $autoload));
+ $this->CI->load->library('javsacript/'.$js_library_driver, array('autoload' => $autoload));
// make js to refer to current library
$this->js =& $this->CI->$js_library_driver;
diff --git a/system/libraries/Jquery.php b/system/libraries/javascript/Jquery.php
index c63a74239..f6b8dce69 100644
--- a/system/libraries/Jquery.php
+++ b/system/libraries/javascript/Jquery.php
@@ -24,7 +24,7 @@
* @link http://www.codeigniter.com/user_guide/libraries/jquery.html
*/
-class Jquery extends CI_Javascript {
+class CI_Jquery extends CI_Javascript {
var $_javascript_folder = 'js';
var $jquery_code_for_load = array();