Skip to content

Commit 3becff1

Browse files
committed
Press This: properly add and load press-this-ie.css, cleanup of the bookmarklet code. Props azaozz. see WordPress#6813
git-svn-id: https://develop.svn.wordpress.org/trunk@8323 602fd350-edb4-49c9-b593-d223f7449a82
1 parent be46d3e commit 3becff1

4 files changed

Lines changed: 22 additions & 16 deletions

File tree

wp-admin/css/press-this-ie.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
#posting {
3+
position: static !important;
4+
}
5+
.ui-tabs-nav {
6+
margin-left: 0;
7+
border: 0 !important;
8+
}

wp-admin/press-this.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ function press_it() {
7979
<head>
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');
9088

@@ -294,12 +292,10 @@ function image_selector() {
294292
<title><?php _e('Press This') ?></title>
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');
305301
wp_enqueue_script('editor_functions');

wp-includes/link-template.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -745,16 +745,16 @@ function posts_nav_link($sep=' &#8212; ', $prelabel='&laquo; Previous Page', $nx
745745

746746
function 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')){
760760
l.href=g;

wp-includes/script-loader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ function wp_default_styles( &$styles ) {
230230
$styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
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' );
235237

0 commit comments

Comments
 (0)