Changeset 8323

Timestamp:

07/13/2008 04:57:01 AM (16 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:

• wp-admin/css/press-this-ie.css (added)
• wp-admin/press-this.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/press-this.php

@@ -80 +80 @@
         <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <title><?php _e('Press This') ?></title>
-        <!--[if gte IE 6]>
-        <link rel="stylesheet" href="./css/press-this-ie.css" type="text/css" media="screen" charset="utf-8" />
-        <![endif]-->
     <?php
         add_thickbox();
         wp_enqueue_style('press-this');
+        wp_enqueue_style('press-this-ie');
         wp_enqueue_style( 'colors' );
         wp_enqueue_script('post');
@@ -295 +293 @@
 
     <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script>
-    <!--[if gte IE 6]>
-    <?php wp_enqueue_style('press-this-ie'); ?>
-    <![endif]-->
 <?php
     add_thickbox();
     wp_enqueue_style('press-this');
+    wp_enqueue_style('press-this-ie');
     wp_enqueue_style( 'colors' );
     wp_enqueue_script('post');

trunk/wp-includes/link-template.php

@@ -746 +746 @@
 function get_shortcut_link() {
     $link = "javascript:
-            var d=document;
-            var w=window;
-            var e=w.getSelection;
-            var k=d.getSelection;
-            var x=d.selection;
-            var s=(e?e():(k)?k():(x?x.createRange().text:0));
-            var f='" . admin_url('press-this.php') . "';
-            var l=d.location;
-            var e=encodeURIComponent;
-            var g=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=2';
+            var d=document,
+            w=window,
+            e=w.getSelection,
+            k=d.getSelection,
+            x=d.selection,
+            s=(e?e():(k)?k():(x?x.createRange().text:0)),
+            f='" . admin_url('press-this.php') . "',
+            l=d.location,
+            e=encodeURIComponent,
+            g=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=2';
             function a(){
                 if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=700,height=500')){

trunk/wp-includes/script-loader.php

@@ -231 +231 @@
     $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
     $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080710' );
+    $styles->add( 'press-this-ie', '/wp-admin/css/press-this-ie.css', array(), '20080710' );
+    $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' );
     $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
     $styles->add( 'login', '/wp-admin/css/login.css' );