WordPress.org

Make WordPress Core

Ticket #2701: 2701c.diff

File 2701c.diff, 17.1 KB (added by mdawaffe, 12 years ago)

absolute links. Better dependencies check

  • wp-includes/default-filters.php

     
    8686add_action('wp_head', 'rsd_link');
    8787add_action('publish_future_post', 'wp_publish_post', 10, 1);
    8888add_action('wp_head', 'noindex', 1);
     89add_action('wp_head', 'wp_print_scripts');
    8990if(!defined('DOING_CRON'))
    9091        add_action('init', 'wp_cron');
    9192add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
  • wp-includes/template-functions-general.php

     
    703703        if ( ! get_option('blog_public') )
    704704                echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
    705705}
     706
     707class WP_Scripts {
     708        var $scripts = array();
     709        var $queue = array();
     710        var $printed = array();
     711
     712        function WP_Scripts() {
     713                $this->default_scripts();
     714        }
     715
     716        function default_scripts() {
     717                $this->add( 'dbx', '/wp-includes/js/dbx.js', false, '2.02' );
     718                $this->add( 'dbx-key', '/wp-includes/js/dbx-key.js', false, '3651' );
     719                $this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' );
     720                $this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
     721                $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
     722                $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
     723                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '04162006' );
     724                $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
     725                if ( is_admin() ) {
     726                        $this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '3733' );
     727                        $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' );
     728                        $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );
     729                        $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );
     730                        $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3736' );
     731                        $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' );
     732                        $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
     733                }
     734        }
     735
     736        /**
     737         * Prints script tags
     738         *
     739         * Prints the scripts passed to it or the print queue.  Also prints all necessary dependencies.
     740         *
     741         * @param mixed handles (optional) Scripts to be printed.  (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
     742         * @return array Scripts that have been printed
     743         */
     744        function print_scripts( $handles = false ) {
     745                // Print the queue if nothing is passed.  If a string is passed, print that script.  If an array is passed, print those scripts.
     746                $handles = false === $handles ? $this->queue : (array) $handles;
     747                $handles = $this->all_deps( $handles );
     748                $this->_print_scripts( $handles );
     749                return $this->printed;
     750        }
     751
     752        /**
     753         * Internally used helper function for printing script tags
     754         *
     755         * @param array handles Hierarchical array of scripts to be printed
     756         * @see WP_Scripts::all_deps()
     757         */
     758        function _print_scripts( $handles ) {
     759                global $wp_db_version;
     760
     761                foreach( array_keys($handles) as $handle ) {
     762                        if ( !$handles[$handle] )
     763                                return;
     764                        elseif ( is_array($handles[$handle]) )
     765                                $this->_print_scripts( $handles[$handle] );
     766                        if ( !in_array($handle, $this->printed) && isset($this->scripts[$handle]) ) {
     767                                $ver = $this->scripts[$handle]->ver ? $this->scripts[$handle]->ver : $wp_db_version;
     768                                $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_settings( 'siteurl' ) . $this->scripts[$handle]->src;
     769                                echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n";
     770                                $this->printed[] = $handle;
     771                        }
     772                }
     773        }
     774                               
     775
     776        /**
     777         * Determines dependencies of scripts
     778         *
     779         * Recursively builds hierarchical array of script dependencies.  Does NOT catch infinite loops.
     780         *
     781         * @param mixed handles Accepts (string) script name or (array of strings) script names
     782         * @param bool recursion Used internally when function calls itself
     783         * @return array Hierarchical array of dependencies
     784         */
     785        function all_deps( $handles, $recursion = false ) {
     786                if ( ! $handles = (array) $handles )
     787                        return array();
     788                $return = array_combine( $handles, array_fill(0, count($handles), true) );
     789                foreach ( $handles as $handle ) {
     790                        if ( $this->scripts[$handle]->deps ) {
     791                                if ( false !== $return[$handle] && array_diff($this->scripts[$handle]->deps, array_keys($this->scripts)) )
     792                                        $return[$handle] = false;
     793                                else
     794                                        $return[$handle] = $this->all_deps( $this->scripts[$handle]->deps, true );
     795                        }
     796                        if ( $recursion && false === $return[$handle] )
     797                                return false;
     798                }
     799                return $return;
     800        }
     801
     802        /**
     803         * Adds script
     804         *
     805         * Adds the script only if no script of that name already exists
     806         *
     807         * @param string handle Script name
     808         * @param string src Script url
     809         * @param array deps (optional) Array of script names on which this script depends
     810         * @param string ver (optional) Script version (used for cache busting)
     811         * @return array Hierarchical array of dependencies
     812         */
     813        function add( $handle, $src, $deps = array(), $ver = false ) {
     814                if ( isset($this->scripts[$handle]) )
     815                        return false;
     816                $this->scripts[$handle] = new _WP_Script( $handle, $src, $deps, $ver );
     817                return true;
     818        }
     819
     820        function remove( $handles ) {
     821                foreach ( (array) $handles as $handle )
     822                        unset($this->scripts[$handle]);
     823        }
     824
     825        function enqueue( $handles ) {
     826                foreach ( (array) $handles as $handle )
     827                        if ( !in_array($handle, $this->queue) && isset($this->scripts[$handle]) )
     828                                $this->queue[] = $handle;
     829        }
     830
     831        function dequeue( $handles ) {
     832                foreach ( (array) $handles as $handle )
     833                        unset( $this->queue[$handle] );
     834        }
     835
     836        function query( $handle, $list = 'scripts' ) { // scripts, queue, or printed
     837                switch ( $list ) :
     838                case 'scripts':
     839                        if ( isset($this->scripts[$handle]) )
     840                                return $this->scripts[$handle];
     841                        break;
     842                default:
     843                        if ( in_array($handle, $this->$list) )
     844                                return true;
     845                        break;
     846                endswitch;
     847                return false;
     848        }
     849                       
     850}
     851
     852class _WP_Script {
     853        var $handle;
     854        var $src;
     855        var $deps = array();
     856        var $ver = false;
     857
     858        function _WP_Script() {
     859                @list($this->handle, $this->src, $this->deps, $this->ver) = func_get_args();
     860                if ( !is_array($this->deps) )
     861                        $this->deps = array();
     862                if ( !$this->ver )
     863                        $this->ver = false;
     864        }
     865}
     866
     867/**
     868 * Prints script tags in document head
     869 *
     870 * Called by admin-header.php and by wp_head hook. Since it is called by wp_head on every page load,
     871 * the function does not instantiate the WP_Scripts object unless script names are explicitly passed.
     872 * Does make use of already instantiated $wp_scripts if present.
     873 * Use provided wp_print_scripts hook to register/enqueue new scripts.
     874 *
     875 * @see WP_Scripts::print_scripts()
     876 */
     877function wp_print_scripts( $handles = false ) {
     878        do_action( 'wp_print_scripts' );
     879
     880        global $wp_scripts;
     881        if ( !is_a($wp_scripts, 'WP_Scripts') ) {
     882                if ( !$handles )
     883                        return array(); // No need to instantiate if nothing's there.
     884                else
     885                        $wp_scripts = new WP_Scripts();
     886        }
     887
     888        return $wp_scripts->print_scripts( $handles );
     889}
     890
     891function wp_register_script( $handle, $src, $deps = array(), $ver = false ) {
     892        global $wp_scripts;
     893        if ( !is_a($wp_scripts, 'WP_Scripts') )
     894                $wp_scripts = new WP_Scripts();
     895
     896        $wp_scripts->add( $handle, $src, $deps, $ver );
     897}
     898
     899function wp_deregister_script( $handle ) {
     900        global $wp_scripts;
     901        if ( !is_a($wp_scripts, 'WP_Scripts') )
     902                $wp_scripts = new WP_Scripts();
     903
     904        $wp_scripts->remove( $handle );
     905}
     906
     907/**
     908 * Equeues script
     909 *
     910 * Registers the script if src provided (does NOT overwrite) and enqueues.
     911 *
     912 * @see WP_Script::add(), WP_Script::enqueue()
     913*/
     914function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false ) {
     915        global $wp_scripts;
     916        if ( !is_a($wp_scripts, 'WP_Scripts') )
     917                $wp_scripts = new WP_Scripts();
     918
     919        if ( $src )
     920                $wp_scripts->add( $handle, $src, $deps, $ver );
     921        $wp_scripts->enqueue( $handle );
     922}
     923
    706924?>
  • wp-includes/functions-post.php

     
    10321032}
    10331033
    10341034/**
    1035  * Places two script links in <head>: one to get tinyMCE (big), one to configure and start it (small)
     1035 * Deprecated.  Use wp_print_scripts() or WP_Scripts instead.
    10361036 */
    10371037function tinymce_include() {
    1038         $ver = '04162006';
    1039         $src1 = get_settings('siteurl') . "/wp-includes/js/tinymce/tiny_mce_gzip.php?ver=$ver";
    1040         $src2 = get_settings('siteurl') . "/wp-includes/js/tinymce/tiny_mce_config.php?ver=$ver";
    1041 
    1042         echo "<script type='text/javascript' src='$src1'></script>\n";
    1043         echo "<script type='text/javascript' src='$src2'></script>\n";
     1038        wp_print_script( 'wp_tiny_mce' );
    10441039}
    10451040
    10461041/**
  • wp-admin/users.php

     
    143143        }
    144144
    145145default:
     146        wp_enqueue_script( 'admin-users' );
    146147
    147         $list_js = true;
    148         $users_js = true;
    149 
    150148        include ('admin-header.php');
    151149
    152150        $userids = $wpdb->get_col("SELECT ID FROM $wpdb->users;");
  • wp-admin/edit-comments.php

     
    33
    44$title = __('Edit Comments');
    55$parent_file = 'edit.php';
    6 $list_js = true;
     6wp_enqueue_script( 'admin-comments' );
    77
    88require_once('admin-header.php');
    99if (empty($_GET['mode'])) $mode = 'view';
  • wp-admin/admin.php

     
    4040    }
    4141}
    4242
    43 $xfn_js = $sack_js = $list_js = $cat_js = $users_js = $dbx_js = $pmeta_js = $editing = false;
     43wp_enqueue_script( 'fat' );
    4444
     45$editing = false;
     46
    4547require(ABSPATH . '/wp-admin/menu.php');
    4648
    4749// Handle plugin admin pages.
  • wp-admin/admin-functions.php

     
    11731173
    11741174function the_quicktags() {
    11751175        // Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
    1176         if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Safari'))
     1176        if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Safari')) {
    11771177                echo '
    11781178                <div id="quicktags">
    1179                         <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script>
    1180                         <script type="text/javascript">if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 ) edToolbar();</script>
     1179                        ';
     1180                wp_print_scripts( 'quicktags' );
     1181                echo '                  <script type="text/javascript">if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 ) edToolbar();</script>
    11811182                </div>
    11821183';
    1183         else echo '
     1184        } else echo '
    11841185<script type="text/javascript">
    11851186function edInsertContent(myField, myValue) {
    11861187        //IE support
  • wp-admin/moderation.php

     
    33
    44$title = __('Moderate comments');
    55$parent_file = 'edit.php';
    6 $list_js = true;
     6wp_enqueue_script( 'listman' );
    77
    88$wpvarstoreset = array('action', 'item_ignored', 'item_deleted', 'item_approved', 'item_spam', 'feelinglucky');
    99for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     
    229229
    230230include('admin-footer.php');
    231231
    232 ?>
    233  No newline at end of file
     232?>
  • wp-admin/admin-header.php

     
    22@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
    33if (!isset($_GET["page"])) require_once('admin.php');
    44if ( $editing ) {
    5         $dbx_js = true;
    6         $pmeta_js = true;
    7         $list_js = true;
    8         if ( current_user_can('manage_categories') ) {
    9                 $cat_js = true;
    10         }
     5        wp_enqueue_script( array('dbx','admin-custom-fields') );
     6        if ( current_user_can('manage_categories') )
     7                wp_enqueue_script( 'ajaxcat' );
     8        if ( user_can_richedit() )
     9                wp_enqueue_script( 'wp_tiny_mce' );
    1110}
    12 if ( $list_js )
    13         $sack_js = true;
    1411?>
    1512<?php get_admin_page_title(); ?>
    1613<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     
    2421function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
    2522//]]>
    2623</script>
    27 <script type="text/javascript" src="../wp-includes/js/fat.js"></script>
    28 <?php if ( $xfn_js ) { ?>
    29 <script type="text/javascript" src="xfn.js"></script>
    30 <?php } ?>
    31 <?php if ( $sack_js ) { ?>
    32 <script type="text/javascript" src="../wp-includes/js/tw-sack.js"></script>
    33 <?php } ?>
    34 <?php if ( $list_js ) { ?>
    35 <script type="text/javascript" src="list-manipulation-js.php"></script>
    36 <?php } ?>
    37 <?php if ( $pmeta_js ) { ?>
    38 <script type="text/javascript" src="custom-fields.js"></script>
    39 <?php } ?>
    40 <?php if ( 'categories.php' == $pagenow && 'edit' != $action ) { ?>
    41 <script type="text/javascript" src="categories.js"></script>
    42 <?php } ?>
    43 <?php if ( $users_js ) { ?>
    44 <script type="text/javascript" src="users.js"></script>
    45 <?php } ?>
    46 <?php if ( 'edit-comments.php' == $pagenow || ( 'edit.php' == $pagenow && 1 == $_GET['c'] ) ) { ?>
    47 <script type="text/javascript" src="edit-comments.js"></script>
    48 <?php } ?>
    49 <?php if ( $dbx_js ) { ?>
    50 <script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
     24<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') ) : ?>
     25<style type="text/css">* html { overflow-x: hidden; }</style>
     26<?php endif; $printed_scripts = wp_print_scripts(); ?>
     27<?php if ( in_array('dbx', $printed_scripts) ) { ?>
    5128<script type="text/javascript">
    5229//<![CDATA[
    5330addLoadEvent( function() {
     
    6340</script>
    6441<script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
    6542<?php } ?>
    66 <?php if ( $editing && user_can_richedit() ) { tinymce_include(); } ?>
    67 <?php if ( $cat_js ) { ?>
    68 <script type="text/javascript" src="cat-js.php"></script>
    69 <?php } ?>
    70 <?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') ) : ?>
    71 <style type="text/css">* html { overflow-x: hidden; }</style>
    72 <?php endif; ?>
    7343<?php do_action('admin_head'); ?>
    7444</head>
    7545<body>
  • wp-admin/link-add.php

     
    2525    }
    2626}
    2727
    28 $xfn_js = true;
     28wp_enqueue_script( 'xfn' );
    2929$editing = true;
    3030require('admin-header.php');
    3131?>
  • wp-admin/edit.php

     
    33
    44$title = __('Posts');
    55$parent_file = 'edit.php';
    6 $list_js = true;
     6wp_enqueue_script( 1 == $_GET['c'] ? 'admin-comments' : 'listman' );
    77require_once('admin-header.php');
    88
    99$_GET['m'] = (int) $_GET['m'];
  • wp-admin/link.php

     
    102102                break;
    103103
    104104        case 'edit' :
    105                 $xfn_js = true;
     105                wp_enqueue_script( 'xfn' );
    106106                $editing = true;
    107107                $parent_file = 'link-manager.php';
    108108                $submenu_file = 'link-manager.php';
     
    124124}
    125125
    126126include ('admin-footer.php');
    127 ?>
    128  No newline at end of file
     127?>
  • wp-admin/link-manager.php

     
    88
    99$title = __('Manage Bookmarks');
    1010$this_file = $parent_file = 'link-manager.php';
    11 $list_js = true;
     11wp_enqueue_script( 'listman' );
    1212
    1313$wpvarstoreset = array ('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]');
    1414
  • wp-admin/edit-pages.php

     
    22require_once('admin.php');
    33$title = __('Pages');
    44$parent_file = 'edit.php';
    5 $list_js = true;
     5wp_enqueue_script( 'listman' );
    66require_once('admin-header.php');
    77?>
    88
  • wp-admin/categories.php

     
    112112
    113113default:
    114114
    115 $list_js = true;
     115wp_enqueue_script( 'admin-categories' );
    116116require_once ('admin-header.php');
    117117
    118118$messages[1] = __('Category added.');
     
    182182
    183183include('admin-footer.php');
    184184
    185 ?>
    186  No newline at end of file
     185?>