Changeset 17419

Show
Ignore:
Timestamp:
09/06/08 09:12:09 (3 months ago)
Author:
adrenalin
Message:

Moved jQuery version definition to MidCOM configuration and added
jQuery UI constant.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.core/midcom/application.php

    r17339 r17419  
    28272827     * 
    28282828     */ 
    2829     function enable_jquery($version="1.2.1") 
     2829    function enable_jquery($version = null) 
    28302830    { 
    28312831        if ($this->_jquery_enabled) 
    …… 
    28332833            return; 
    28342834        } 
     2835         
     2836        if (!$version) 
     2837        { 
     2838            $version = $GLOBALS['midcom_config']['jquery_version']; 
     2839        } 
    28352840 
    28362841        $url = MIDCOM_STATIC_URL . "/jQuery/jquery-{$version}.js"; 
    2837         $this->_jquery_init_scripts = '<script type="text/javascript" src="' . $url . '"></script>' . "\n"; 
    2838  
    2839         $script = 'var $j = jQuery.noConflict();'."\n"; 
     2842        $this->_jquery_init_scripts = "<script type=\"text/javascript\" src=\"{$url}\"></script>\n"; 
     2843 
     2844        if (!defined('MIDCOM_JQUERY_UI_URL')) 
     2845        { 
     2846            define('MIDCOM_JQUERY_UI_URL', MIDCOM_STATIC_URL . "/jQuery/jquery.ui-{$GLOBALS['midcom_config']['jquery_ui_version']}"); 
     2847        } 
     2848         
     2849        $script = "var \$j = jQuery.noConflict();\n"; 
    28402850        $script .= "var MIDCOM_STATIC_URL = '" . MIDCOM_STATIC_URL . "';\n"; 
    28412851        $script .= "var MIDCOM_PAGE_PREFIX = '" . $_MIDCOM->get_page_prefix() . "';\n"; 
    …… 
    28732883            $status_target = $status_parts[0]; 
    28742884            $status_method = $status_parts[1]; 
    2875             echo "\n" . 'jQuery(' . $status_target . ').' . $status_method . '(function() {'."\n"; 
     2885            echo "\njQuery({$status_target}).{$status_method}(function() {\n"; 
    28762886            echo $scripts; 
    28772887            echo "\n" . '});' . "\n"; 

  • trunk/midcom/midcom.core/midcom/config/midcom_config.php

    r17341 r17419  
    530530$GLOBALS['midcom_config_default']['enable_scriptaculous'] = true; 
    531531$GLOBALS['midcom_config_default']['jquery_no_conflict'] = true; 
     532$GLOBALS['midcom_config_default']['jquery_version'] = '1.2.6'; 
     533$GLOBALS['midcom_config_default']['jquery_ui_version'] = '1.5.2'; 
    532534 
    533535$GLOBALS['midcom_config_default']['auto_formatter'] = array();