Press This: Fix inserting the selection in the editor and stripping of paragraphs when saving, IE CSS styling fixes, fix continuous linking in editor. Props noel and azaozz. see #6813
git-svn-id: http://svn.automattic.com/wordpress/trunk@8316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
ecd98d1aff
commit
e027fac4f6
|
|
@ -231,7 +231,8 @@ div#posting h2 {
|
|||
}
|
||||
|
||||
#photo_saving {
|
||||
margin-bottom: 8px;
|
||||
margin: 0 8px 8px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#img_container {
|
||||
|
|
@ -302,6 +303,7 @@ div#categories h2 {
|
|||
#jaxtag {
|
||||
clear: both;
|
||||
padding-left: 1em;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#tagchecklist {
|
||||
|
|
@ -348,7 +350,7 @@ div#categories h2 {
|
|||
-webkit-border-bottom-right-radius: 3px;
|
||||
border-bottom-right-radius: 3px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding: 10px;
|
||||
}
|
||||
.submitbox {
|
||||
width: 100%;
|
||||
|
|
@ -363,10 +365,9 @@ div#categories h2 {
|
|||
.submitbox .submit input {
|
||||
border: none;
|
||||
text-align: left;
|
||||
padding: 12px 10px 10px 10px;
|
||||
padding: 6px 4px;
|
||||
font-size: 12px;
|
||||
margin: 10px;
|
||||
|
||||
margin: 2px;
|
||||
-moz-border-radius: 3px;
|
||||
-khtml-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
|
|
|
|||
|
|
@ -14,12 +14,15 @@ function aposfix($text) {
|
|||
}
|
||||
function press_it() {
|
||||
// define some basic variables
|
||||
$quick['post_status'] = $_REQUEST['post_status'];
|
||||
$quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft';
|
||||
$quick['post_category'] = $_REQUEST['post_category'];
|
||||
$quick['tags_input'] = $_REQUEST['tags_input'];
|
||||
$quick['post_title'] = $_REQUEST['post_title'];
|
||||
$quick['post_content'] = '';
|
||||
|
||||
$posted = str_replace('<br />', "\n", str_replace('<p>', '', $_REQUEST['content']));
|
||||
$posted = str_replace('</p>', "\n\n", $posted);
|
||||
|
||||
// insert the post with nothing in it, to get an ID
|
||||
$post_ID = wp_insert_post($quick, true);
|
||||
|
||||
|
|
@ -27,19 +30,18 @@ function press_it() {
|
|||
switch ( $_REQUEST['post_type'] ) {
|
||||
case 'text':
|
||||
case 'quote':
|
||||
$content .= $_REQUEST['content'];
|
||||
$content .= $posted;
|
||||
break;
|
||||
|
||||
case 'photo':
|
||||
$content = $_REQUEST['content'];
|
||||
$content = $posted;
|
||||
|
||||
foreach($_REQUEST['photo_src'] as $key => $image) {
|
||||
foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
|
||||
// escape quote for matching
|
||||
$quoted = preg_quote2($image);
|
||||
|
||||
// see if files exist in content - we don't want to upload non-used selected files.
|
||||
preg_match('/'.$quoted.'/', $_REQUEST['content'], $matches[0]);
|
||||
if($matches[0]) {
|
||||
if( strpos($posted, $quoted) !== false ) {
|
||||
$upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
|
||||
// Replace the POSTED content <img> with correct uploaded ones.
|
||||
if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
|
||||
|
|
@ -51,11 +53,11 @@ function press_it() {
|
|||
case "video":
|
||||
if($_REQUEST['embed_code'])
|
||||
$content .= $_REQUEST['embed_code']."\n\n";
|
||||
$content .= $_REQUEST['content'];
|
||||
$content .= $posted;
|
||||
break;
|
||||
}
|
||||
// set the post_content
|
||||
$quick['post_content'] = str_replace('<br />', "\n", preg_replace('/<\/?p>/','',$content));
|
||||
$quick['post_content'] = preg_replace("/\n\n+/", "\n\n", $content);
|
||||
|
||||
// error handling for $post
|
||||
if ( is_wp_error($post_ID)) {
|
||||
|
|
@ -80,6 +82,9 @@ if ( 'post' == $_REQUEST['action'] ) {
|
|||
<head>
|
||||
<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');
|
||||
|
|
@ -109,7 +114,12 @@ if ( 'post' == $_REQUEST['action'] ) {
|
|||
// Ajax Requests
|
||||
$title = wp_specialchars(aposfix(stripslashes($_GET['t'])));
|
||||
|
||||
$selection = str_replace("\n", "<br />", aposfix( stripslashes($_GET['s']) ) );
|
||||
$selection = trim( aposfix( stripslashes($_GET['s']) ) );
|
||||
if ( ! empty($selection) ) {
|
||||
$selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
|
||||
$selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
|
||||
}
|
||||
|
||||
$url = clean_url($_GET['u']);
|
||||
$image = $_GET['i'];
|
||||
|
||||
|
|
@ -287,6 +297,9 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
<title><?php _e('Press This') ?></title>
|
||||
|
||||
<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');
|
||||
|
|
@ -330,7 +343,7 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
remove_script_host : false,
|
||||
convert_urls : false,
|
||||
apply_source_formatting : false,
|
||||
remove_linebreaks : false,
|
||||
remove_linebreaks : true,
|
||||
accessibility_focus : false,
|
||||
tab_focus : ":next",
|
||||
plugins : "safari,inlinepopups",
|
||||
|
|
@ -368,12 +381,12 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
}
|
||||
|
||||
function set_editor(text) {
|
||||
if(tinyMCE.activeEditor) tinyMCE.activeEditor.setContent('');
|
||||
if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
|
||||
if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
|
||||
if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, text);
|
||||
}
|
||||
|
||||
function append_editor(text) {
|
||||
if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
|
||||
if ( '' != text && tinyMCE.activeEditor ) tinyMCE.execCommand('mceInsertContent', false, text);
|
||||
}
|
||||
|
||||
function set_title(title) { jQuery("#content_type").text(title); }
|
||||
|
|
@ -386,16 +399,16 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
set_menu('text');
|
||||
set_title('<?php _e('Post') ?>');
|
||||
<?php if ($selection) { ?>
|
||||
set_editor("<?php echo $selection; ?>");
|
||||
set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a> ‏</p>');
|
||||
<?php } else { ?>
|
||||
set_editor("<a href='<?php echo $url ?>'><?php echo $title; ?></a>");
|
||||
set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
|
||||
<?php } ?>
|
||||
return false;
|
||||
break;
|
||||
case 'quote' :
|
||||
set_menu('quote');
|
||||
set_title('<?php _e('Quote') ?>');
|
||||
set_editor("<blockquote><p><?php echo $selection; ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?> </a> </cite> </p></blockquote>");
|
||||
set_editor('<blockquote><?php echo $selection; ?> <p><cite><a href="<?php echo $url; ?>"><?php echo $title; ?> </a> </cite> </p></blockquote>');
|
||||
return false;
|
||||
break;
|
||||
case 'video' :
|
||||
|
|
@ -405,6 +418,7 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
jQuery('body').addClass('video_split');
|
||||
jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo attribute_escape($selection); ?>'}, function() {
|
||||
<?php
|
||||
$content = '';
|
||||
if ( preg_match("/youtube\.com\/watch/i", $url) ) {
|
||||
list($domain, $video_id) = split("v=", $url);
|
||||
$content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
|
||||
|
|
@ -414,16 +428,15 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
$content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" /> <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
|
||||
|
||||
if ( trim($selection) == '' )
|
||||
$selection = '<a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a>';
|
||||
$selection = '<p><a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a></p>';
|
||||
|
||||
} else {
|
||||
} elseif ( strpos( $selection, '<object' ) !== false ) {
|
||||
$content = $selection;
|
||||
}
|
||||
|
||||
?>
|
||||
jQuery('#embed_code').prepend('<?php echo htmlentities($content); ?>');
|
||||
|
||||
set_editor("<?php echo $title; ?>");
|
||||
set_editor('<a href="<?php echo $url ?>"><?php echo $title; ?></a> ‏');
|
||||
});
|
||||
return false;
|
||||
break;
|
||||
|
|
@ -431,9 +444,9 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
set_menu('photo');
|
||||
set_title('<?php _e('Post') ?>');
|
||||
<?php if ($selection) { ?>
|
||||
set_editor("<?php echo $selection; ?>");
|
||||
set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
|
||||
<?php } else { ?>
|
||||
set_editor("<a href='<?php echo $url ?>'><?php echo $title; ?></a>");
|
||||
set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
|
||||
<?php } ?>
|
||||
jQuery('#extra_fields').show();
|
||||
jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>');
|
||||
|
|
@ -497,33 +510,33 @@ if($_REQUEST['ajax'] == 'photo') { ?>
|
|||
<div class="editor_area">
|
||||
<h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
|
||||
<div class="editor-container">
|
||||
<textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea>
|
||||
<textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a> ‏</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="categories">
|
||||
<div class="submitbox" id="submitpost">
|
||||
<div id="previewview"></div>
|
||||
<div class="inside">
|
||||
<h2><?php _e('Categories') ?></h2>
|
||||
<div id="categories-all">
|
||||
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
|
||||
<?php wp_category_checklist() ?>
|
||||
</ul>
|
||||
<div id="previewview"></div>
|
||||
<div class="inside">
|
||||
<h2><?php _e('Categories') ?></h2>
|
||||
<div id="categories-all">
|
||||
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
|
||||
<?php wp_category_checklist() ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<h2><?php _e('Tags') ?></h2>
|
||||
<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
|
||||
<div id="tagchecklist"></div>
|
||||
</div>
|
||||
<h2><?php _e('Tags') ?></h2>
|
||||
<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
|
||||
<div id="tagchecklist"></div>
|
||||
|
||||
<p class="submit">
|
||||
<input type="submit" name="draft" value="<?php _e('Save') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
|
||||
<input type="submit" name="publish" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
|
||||
<img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
|
||||
</p>
|
||||
</div>
|
||||
<div id="post_status">
|
||||
<input type="radio" name="post_status" value="publish" checked="checked" id="published" /> <label for="published"><?php _e('Published'); ?></label>
|
||||
<input type="radio" name="post_status" value="draft" id="unpublished" /> <label for="unpublished"><?php _e('Unpublished'); ?></label>
|
||||
</div>
|
||||
<p class="submit">
|
||||
<input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
|
||||
<img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ function wp_default_styles( &$styles ) {
|
|||
$styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );
|
||||
$styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
|
||||
$styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
|
||||
$styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080704' );
|
||||
$styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080710' );
|
||||
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
|
||||
$styles->add( 'login', '/wp-admin/css/login.css' );
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue