Index: jquery_ui.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_ui/jquery_ui.info,v retrieving revision 1.3 diff -u -r1.3 jquery_ui.info --- jquery_ui.info 21 May 2009 22:03:30 -0000 1.3 +++ jquery_ui.info 11 Jun 2009 20:58:59 -0000 @@ -3,3 +3,4 @@ description = Provides the jQuery UI plug-in to other Drupal modules. package = User interface core = 6.x +dependencies[] = libraries Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_ui/README.txt,v retrieving revision 1.5 diff -u -r1.5 README.txt --- README.txt 21 May 2009 22:03:30 -0000 1.5 +++ README.txt 11 Jun 2009 20:58:59 -0000 @@ -29,17 +29,17 @@ INSTALLATION ------------ -1. Copy the jquery_ui module directory to your sites/all/modules directory. +1. Copy the libraries and jquery_ui modules to your sites/all/modules folder. 2. Download the latest jQuery 1.6 development package from: http://code.google.com/p/jquery-ui/downloads/list?can=3&q=1.6 -3. Extract it as a sub-directory called 'jquery.ui' in the jquery_ui folder: +3. Extract it to a folder in sites/all/libraries and name it "jquery.ui": - /sites/all/modules/jquery_ui/jquery.ui/ + /sites/all/libraries/jquery.ui/ -4. Enable the module at Administer >> Site building >> Modules. +4. Enable the libraries and jquery_ui modules at admin/build/modules. JQUERY UI 1.7 Index: jquery_ui.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_ui/jquery_ui.module,v retrieving revision 1.6 diff -u -r1.6 jquery_ui.module --- jquery_ui.module 21 May 2009 22:03:30 -0000 1.6 +++ jquery_ui.module 11 Jun 2009 20:58:59 -0000 @@ -11,11 +11,6 @@ */ /** - * Path to jQuery UI library. - */ -define('JQUERY_UI_PATH', drupal_get_path('module', 'jquery_ui') . '/jquery.ui'); - -/** * Add the specified jQuery UI library files to this page. * * The ui.core file is always included automatically, as well as the @@ -27,7 +22,7 @@ */ function jquery_ui_add($files = array()) { static $loaded_files, $ui_core, $effects_core; - $jquery_ui_path = JQUERY_UI_PATH . '/ui'; + $jquery_ui_path = libraries_get_path('jquery.ui'); $compression = variable_get('jquery_update_compression_type', 'mini'); // Convert file to an array if it's not one already, to compensate for @@ -77,8 +72,8 @@ function jquery_ui_get_version() { $version = 0; - if (file_exists(JQUERY_UI_PATH . '/version.txt')) { - $version = file_get_contents(JQUERY_UI_PATH . '/version.txt'); + if (file_exists(libraries_get_path('jquery.ui') . '/version.txt')) { + $version = file_get_contents(libraries_get_path('jquery.ui') . '/version.txt'); } return $version; Index: jquery_ui.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_ui/Attic/jquery_ui.install,v retrieving revision 1.5 diff -u -r1.5 jquery_ui.install --- jquery_ui.install 21 May 2009 22:03:30 -0000 1.5 +++ jquery_ui.install 11 Jun 2009 20:58:59 -0000 @@ -17,7 +17,8 @@ if ($phase == 'install') { // The jquery_ui_get_version() function is in the .module file, which isn't // loaded yet. - include_once drupal_get_path('module', 'jquery_ui') . '/jquery_ui.module'; + module_load_include('module', 'libraries'); + module_load_include('module', 'jquery_ui'); } $requirements['jquery_ui']['title'] = $t('jQuery UI');