Changeset 4701

Show
Ignore:
Timestamp:
01/08/07 03:03:36 (2 years ago)
Author:
ryan
Message:

Scriptaculous loader changes from mdawaffe. fixes #3519

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/script-loader.php

    r4689 r4701  
    2323        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459'); 
    2424        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583'); 
    25         $this->add( 'scriptaculous', '/wp-includes/js/scriptaculous/scriptaculous.js', array('prototype'), '1.6.1'); 
    26         $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/scriptaculous.js?load=builder,dragdrop', array('prototype'), '1.6.1'); 
    27         $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/scriptaculous.js?load=slider,effects', array('prototype'), '1.6.1'); 
    28         $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/scriptaculous.js?load=controls', array('prototype'), '1.6.1'); 
     25        $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.6.1'); 
     26        $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.6.1'); 
     27        $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder'), '1.6.1'); 
     28        $this->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.6.1'); 
     29        $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.6.1'); 
     30        $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.6.1'); 
     31        $this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.6.1'); 
    2932        $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '1'); 
    3033        if ( is_admin() ) { 
    …… 
    7174                $this->_print_scripts( $handles[$handle] ); 
    7275            if ( !in_array($handle, $this->printed) && isset($this->scripts[$handle]) ) { 
    73                 $ver = $this->scripts[$handle]->ver ? $this->scripts[$handle]->ver : $wp_db_version; 
    74                 if ( isset($this->args[$handle]) ) 
    75                     $ver .= '&' . $this->args[$handle]; 
    76                 $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src; 
    77                 echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n"; 
     76                if ( $this->scripts[$handle]->src ) { // Else it defines a group. 
     77                    $ver = $this->scripts[$handle]->ver ? $this->scripts[$handle]->ver : $wp_db_version; 
     78                    if ( isset($this->args[$handle]) ) 
     79                        $ver .= '&amp;' . $this->args[$handle]; 
     80                    $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src; 
     81                    $src = add_query_arg('ver', $ver, $src); 
     82                    echo "<script type='text/javascript' src='$src'></script>\n"; 
     83                } 
    7884                $this->printed[] = $handle; 
    7985            }