';
- });
+ ed.wpSetGalleryPreview = function(content) {
+ return t._do_gallery(content);
+ }
},
- _get_gallery : function(co) {
+ _do_gallery : function(content) {
+ var self = this, ed = self.ed, dom = ed.dom, args, data, post_id, sh = self.sh;
- function getAttr(s, n) {
- n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
- return n ? tinymce.DOM.decode(n[1]) : '';
+ if ( !content.match(/\[gallery[^\]]*\]/) )
+ return content;
+
+ // post_ID is a hidden input field in edit-form-advanced.php
+ post_id = document.getElementById('post_ID');
+ if ( post_id )
+ post_id = post_id.value;
+ else
+ return content;
+
+ args = {
+ url: ajaxurl,
+ type: 'POST',
+ content_type: 'application/x-www-form-urlencoded',
+ success: function(r) {
+ var shortcode, div_id, new_id;
+
+ div_id = /^wp_gallery_shortcode_\d+/.exec(r);
+ shortcode = div_id && sh[div_id] ? sh[div_id] : '';
+
+ if ( !div_id || !shortcode ) {
+ ed.setProgressState(false);
+ return;
+ }
+
+ div_id = div_id.toString();
+ r = r.replace(div_id, '');
+ // if there are any " even double entity encoded, switching Visual -> Text and back breaks it
+ shortcode = encodeURIComponent( shortcode );
+ div = ed.dom.select('div#'+div_id);
+
+ if ( !div ) {
+ ed.setProgressState(false);
+ return;
+ }
+
+ new_id = 'wp_gallery_preview_' + div_id.replace(/[^0-9]+/, '');
+ dom.setAttrib( div, 'id', new_id );
+ dom.setAttrib( div, 'data-wp-gallery-args', shortcode );
+ dom.addClass( div, 'wp-gallery-preview mceNonEditable' );
+ dom.setHTML( div, r );
+
+ ed.setProgressState(false);
+ ed.execCommand('mceRepaint');
+ },
+ error: function() {
+ ed.setProgressState(false);
+ }
};
- return co.replace(/(?:['+tinymce.trim(getAttr(im, 'title'))+']
'; + ed.setProgressState(true); - return a; + return content.replace(/(?:\s*)?(\[gallery[^\]]*\])(?:\s*<\/p>)?/g, function(a, shortcode){ + var val, div_id, str = ''; + + sh.i++; + div_id = 'wp_gallery_shortcode_' + sh.i; + data['mcediv_id'] = div_id; + sh[div_id] = shortcode; + data['shortcode'] = shortcode; + + for ( val in data ) { + if ( str ) + str += '&'; + + str += val + '=' + encodeURIComponent( data[val] ); + } + + args['data'] = str; + tinymce.util.XHR.send( args ); + + return '
' + shortcode + '
';
});
},
+ _remove_gallery_preview : function() {
+ var ed = this.ed, dom = ed.dom, divs;
+
+ divs = ed.dom.select('div.wp-gallery-preview');
+ if ( !divs )
+ return;
+
+ tinymce.each( divs, function(el){
+ var p, args = dom.getAttrib( el, 'data-wp-gallery-args' );
+
+ args = args ? ' ' + decodeURIComponent(args) : '';
+ p = dom.create( 'p', {}, args );
+ dom.replace( p, el );
+ });
+ },
+
_createButtons : function() {
var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, editButton, dellButton;
Index: wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
===================================================================
--- wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (revision 21514)
+++ wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (working copy)
@@ -147,3 +147,56 @@
height: 250px;
}
+/* Gallery preview */
+
+div.wp-gallery-preview {
+ margin: 10px auto;
+ -ms-user-select: none;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
+
+div.wp-gallery-preview .gallery-icon {
+ text-align: center;
+}
+
+div.wp-gallery-preview .gallery-icon img {
+ margin: 0;
+ padding: 0;
+ max-width: 90%;
+ height: auto;
+}
+
+div.wp-gallery-preview div.gallery {
+ clear: both;
+}
+
+div.wp-gallery-preview div.gallery dl.gallery-item {
+ float: left;
+ margin: 10px 0;
+ padding: 0;
+}
+
+div.wp-gallery-preview div.gallery-columns-1 dl.gallery-item {
+ width: 98%;
+}
+
+div.wp-gallery-preview div.gallery-columns-2 dl.gallery-item {
+ width: 49%;
+}
+
+div.wp-gallery-preview div.gallery-columns-3 dl.gallery-item {
+ width: 32%;
+}
+
+div.wp-gallery-preview div.gallery-columns-4 dl.gallery-item {
+ width: 24%;
+}
+
+div.wp-gallery-preview div.gallery-columns-5 dl.gallery-item {
+ width: 19%;
+}
+
+
+
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php (revision 21514)
+++ wp-includes/media.php (working copy)
@@ -780,10 +780,12 @@
static $instance = 0;
$instance++;
- // Allow plugins/themes to override the default gallery template.
- $output = apply_filters('post_gallery', '', $attr);
- if ( $output != '' )
- return $output;
+ // Allow plugins/themes to override the default gallery template if not previewing.
+ if ( !isset($attr['mce_preview']) ) {
+ $output = apply_filters('post_gallery', '', $attr);
+ if ( $output != '' )
+ return $output;
+ }
// We're trusting author input, so let's at least make sure it looks like a valid orderby statement
if ( isset( $attr['orderby'] ) ) {
@@ -792,20 +794,23 @@
unset( $attr['orderby'] );
}
- extract(shortcode_atts(array(
+ $attr = shortcode_atts( array(
'order' => 'ASC',
'orderby' => 'menu_order ID',
- 'id' => $post->ID,
+ 'id' => isset($post) ? $post->ID : 0,
'itemtag' => 'dl',
'icontag' => 'dt',
'captiontag' => 'dd',
'columns' => 3,
'size' => 'thumbnail',
'include' => '',
- 'exclude' => ''
- ), $attr));
+ 'exclude' => '',
+ 'mce_preview' => false,
+ ), $attr );
+ extract( $attr, EXTR_SKIP );
$id = intval($id);
+
if ( 'RAND' == $order )
$orderby = 'none';
@@ -817,10 +822,10 @@
foreach ( $_attachments as $key => $val ) {
$attachments[$val->ID] = $_attachments[$key];
}
- } elseif ( !empty($exclude) ) {
+ } elseif ( !empty($exclude) && $id ) {
$exclude = preg_replace( '/[^0-9,]+/', '', $exclude );
$attachments = get_children( array('post_parent' => $id, 'exclude' => $exclude, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
- } else {
+ } elseif ( $id ) {
$attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
}
@@ -834,8 +839,15 @@
return $output;
}
- $itemtag = tag_escape($itemtag);
- $captiontag = tag_escape($captiontag);
+ if ( $mce_preview ) {
+ $itemtag = 'dl';
+ $icontag = 'dt';
+ $captiontag = 'dd';
+ } else {
+ $itemtag = tag_escape($itemtag);
+ $captiontag = tag_escape($captiontag);
+ }
+
$columns = intval($columns);
$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
$float = is_rtl() ? 'right' : 'left';
@@ -864,32 +876,35 @@
";
$size_class = sanitize_html_class( $size );
- $gallery_div = "";
- $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );
+ $wrapper_id = $mce_preview ? '' : " id='$selector'";
+ $gallery_div = "";
+ $itemclass = 'gallery-item';
+ if ( $mce_preview ) {
+ $output = $mce_preview . $gallery_div;
+ } else {
+ $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );
+ }
+
$i = 0;
foreach ( $attachments as $id => $attachment ) {
$link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
- $output .= "<{$itemtag} class='gallery-item'>";
- $output .= "
- <{$icontag} class='gallery-icon'>
- $link
- ";
+ $output .= "\n<{$itemtag} class='$itemclass'><{$icontag} class='gallery-icon'>$link";
+
if ( $captiontag && trim($attachment->post_excerpt) ) {
- $output .= "
- <{$captiontag} class='wp-caption-text gallery-caption'>
- " . wptexturize($attachment->post_excerpt) . "
- ";
+ $output .= "<{$captiontag} class='wp-caption-text gallery-caption'>"
+ . wptexturize($attachment->post_excerpt) .
+ "";
}
+
$output .= "";
+
if ( $columns > 0 && ++$i % $columns == 0 )
- $output .= '
'; + $output .= "
"; } - $output .= " -
-
\n";
+ $output .= "'; + $output .= "
"; } - $output .= " -
-