WordPress.org

Make WordPress Core

Changeset 8323


Ignore:
Timestamp:
07/13/2008 04:57:01 AM (10 years ago)
Author:
ryan
Message:

Press This: properly add and load press-this-ie.css, cleanup of the bookmarklet code. Props azaozz. see #6813

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/press-this.php

    r8318 r8323  
    8080        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    8181        <title><?php _e('Press This') ?></title>
    82         <!--[if gte IE 6]>
    83         <link rel="stylesheet" href="./css/press-this-ie.css" type="text/css" media="screen" charset="utf-8" />
    84         <![endif]-->
    8582    <?php
    8683        add_thickbox();
    8784        wp_enqueue_style('press-this');
     85        wp_enqueue_style('press-this-ie');
    8886        wp_enqueue_style( 'colors' );
    8987        wp_enqueue_script('post');
     
    295293
    296294    <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script>
    297     <!--[if gte IE 6]>
    298     <?php wp_enqueue_style('press-this-ie'); ?>
    299     <![endif]-->
    300295<?php
    301296    add_thickbox();
    302297    wp_enqueue_style('press-this');
     298    wp_enqueue_style('press-this-ie');
    303299    wp_enqueue_style( 'colors' );
    304300    wp_enqueue_script('post');
  • trunk/wp-includes/link-template.php

    r8308 r8323  
    746746function get_shortcut_link() {
    747747    $link = "javascript:
    748             var d=document;
    749             var w=window;
    750             var e=w.getSelection;
    751             var k=d.getSelection;
    752             var x=d.selection;
    753             var s=(e?e():(k)?k():(x?x.createRange().text:0));
    754             var f='" . admin_url('press-this.php') . "';
    755             var l=d.location;
    756             var e=encodeURIComponent;
    757             var g=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=2';
     748            var d=document,
     749            w=window,
     750            e=w.getSelection,
     751            k=d.getSelection,
     752            x=d.selection,
     753            s=(e?e():(k)?k():(x?x.createRange().text:0)),
     754            f='" . admin_url('press-this.php') . "',
     755            l=d.location,
     756            e=encodeURIComponent,
     757            g=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=2';
    758758            function a(){
    759759                if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=700,height=500')){
  • trunk/wp-includes/script-loader.php

    r8316 r8323  
    231231    $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
    232232    $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080710' );
     233    $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080710' );
     234    $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' );
    233235    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
    234236    $styles->add( 'login', '/wp-admin/css/login.css' );
Note: See TracChangeset for help on using the changeset viewer.