2012-08-22 20:04:18 -04:00
|
|
|
// send html to the post editor
|
|
|
|
|
|
|
|
var wpActiveEditor;
|
|
|
|
|
|
|
|
function send_to_editor(h) {
|
|
|
|
var ed, mce = typeof(tinymce) != 'undefined', qt = typeof(QTags) != 'undefined';
|
|
|
|
|
|
|
|
if ( !wpActiveEditor ) {
|
|
|
|
if ( mce && tinymce.activeEditor ) {
|
|
|
|
ed = tinymce.activeEditor;
|
|
|
|
wpActiveEditor = ed.id;
|
|
|
|
} else if ( !qt ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else if ( mce ) {
|
|
|
|
if ( tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
|
|
|
|
ed = tinymce.activeEditor;
|
|
|
|
else
|
|
|
|
ed = tinymce.get(wpActiveEditor);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( ed && !ed.isHidden() ) {
|
|
|
|
// restore caret position on IE
|
|
|
|
if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
|
|
|
|
ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
|
|
|
|
|
|
|
|
if ( h.indexOf('[caption') === 0 ) {
|
|
|
|
if ( ed.wpSetImgCaption )
|
|
|
|
h = ed.wpSetImgCaption(h);
|
|
|
|
} else if ( h.indexOf('[gallery') === 0 ) {
|
|
|
|
if ( ed.plugins.wpgallery )
|
|
|
|
h = ed.plugins.wpgallery._do_gallery(h);
|
|
|
|
} else if ( h.indexOf('[embed') === 0 ) {
|
|
|
|
if ( ed.plugins.wordpress )
|
|
|
|
h = ed.plugins.wordpress._setEmbed(h);
|
|
|
|
}
|
|
|
|
|
|
|
|
ed.execCommand('mceInsertContent', false, h);
|
|
|
|
} else if ( qt ) {
|
|
|
|
QTags.insertContent(h);
|
|
|
|
} else {
|
|
|
|
document.getElementById(wpActiveEditor).value += h;
|
|
|
|
}
|
|
|
|
|
|
|
|
try{tb_remove();}catch(e){};
|
|
|
|
}
|
|
|
|
|
|
|
|
// thickbox settings
|
|
|
|
var tb_position;
|
|
|
|
(function($) {
|
|
|
|
tb_position = function() {
|
|
|
|
var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
|
|
|
|
|
|
|
|
if ( $('body.admin-bar').length )
|
|
|
|
adminbar_height = 28;
|
|
|
|
|
|
|
|
if ( tbWindow.size() ) {
|
|
|
|
tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
|
|
|
|
$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
|
|
|
|
tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
|
|
|
|
if ( typeof document.body.style.maxWidth != 'undefined' )
|
|
|
|
tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
|
|
|
|
};
|
|
|
|
|
|
|
|
return $('a.thickbox').each( function() {
|
|
|
|
var href = $(this).attr('href');
|
|
|
|
if ( ! href ) return;
|
|
|
|
href = href.replace(/&width=[0-9]+/g, '');
|
|
|
|
href = href.replace(/&height=[0-9]+/g, '');
|
|
|
|
$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
$(window).resize(function(){ tb_position(); });
|
|
|
|
|
|
|
|
// store caret position in IE
|
|
|
|
$(document).ready(function($){
|
|
|
|
$('a.thickbox').click(function(){
|
|
|
|
var ed;
|
|
|
|
|
|
|
|
if ( typeof(tinymce) != 'undefined' && tinymce.isIE && ( ed = tinymce.get(wpActiveEditor) ) && !ed.isHidden() ) {
|
|
|
|
ed.focus();
|
|
|
|
ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
})(jQuery);
|
2012-09-27 00:09:43 -04:00
|
|
|
|
|
|
|
// WordPress, TinyMCE, and Media
|
|
|
|
// -----------------------------
|
|
|
|
(function($){
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
// Stores the editors' `wp.media.controller.Frame` instances.
|
|
|
|
var workflows = {},
|
|
|
|
linkToUrl;
|
|
|
|
|
|
|
|
linkToUrl = function( attachment, props ) {
|
|
|
|
var link = props.link,
|
|
|
|
url;
|
|
|
|
|
|
|
|
if ( 'file' === link )
|
|
|
|
url = attachment.get('url');
|
|
|
|
else if ( 'post' === link )
|
|
|
|
url = attachment.get('link');
|
|
|
|
else if ( 'custom' === link )
|
|
|
|
url = props.linkUrl;
|
|
|
|
|
|
|
|
return url || '';
|
|
|
|
};
|
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
wp.media.string = {
|
|
|
|
link: function( attachment, props ) {
|
|
|
|
var linkTo = getUserSetting( 'urlbutton', 'post' ),
|
|
|
|
options = {
|
|
|
|
tag: 'a',
|
|
|
|
content: attachment.get('title') || attachment.get('filename'),
|
|
|
|
attrs: {
|
|
|
|
rel: 'attachment wp-att-' + attachment.id
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
options.attrs.href = linkToUrl( attachment, props );
|
|
|
|
|
|
|
|
return wp.html.string( options );
|
|
|
|
},
|
|
|
|
|
|
|
|
image: function( attachment, props ) {
|
|
|
|
var classes, img, options, size, shortcode, html;
|
|
|
|
|
|
|
|
props = _.defaults( props || {}, {
|
|
|
|
img: {},
|
|
|
|
align: getUserSetting( 'align', 'none' ),
|
|
|
|
size: getUserSetting( 'imgsize', 'medium' ),
|
|
|
|
link: getUserSetting( 'urlbutton', 'post' )
|
|
|
|
});
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
props.linkUrl = linkToUrl( attachment, props );
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
attachment = attachment.toJSON();
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
img = _.clone( props.img );
|
|
|
|
classes = img['class'] ? img['class'].split(/\s+/) : [];
|
|
|
|
size = attachment.sizes ? attachment.sizes[ props.size ] : {};
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
if ( ! size ) {
|
|
|
|
delete props.size;
|
|
|
|
size = attachment;
|
|
|
|
}
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
img.width = size.width;
|
|
|
|
img.height = size.height;
|
|
|
|
img.src = size.url;
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
// Only assign the align class to the image if we're not printing
|
|
|
|
// a caption, since the alignment is sent to the shortcode.
|
|
|
|
if ( props.align && ! attachment.caption )
|
|
|
|
classes.push( 'align' + props.align );
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
if ( props.size )
|
|
|
|
classes.push( 'size-' + props.size );
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
classes.push( 'wp-image-' + attachment.id );
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
img['class'] = _.compact( classes ).join(' ');
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
// Generate `img` tag options.
|
|
|
|
options = {
|
|
|
|
tag: 'img',
|
|
|
|
attrs: img,
|
|
|
|
single: true
|
|
|
|
};
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
// Generate the `href` based on the `link` property.
|
|
|
|
if ( props.linkUrl ) {
|
|
|
|
props.anchor = props.anchor || {};
|
|
|
|
props.anchor.href = props.linkUrl;
|
|
|
|
}
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
// Generate the `a` element options, if they exist.
|
|
|
|
if ( props.anchor ) {
|
|
|
|
options = {
|
|
|
|
tag: 'a',
|
|
|
|
attrs: props.anchor,
|
|
|
|
content: options
|
|
|
|
};
|
|
|
|
}
|
2012-09-27 00:09:43 -04:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
html = wp.html.string( options );
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
// Generate the caption shortcode.
|
|
|
|
if ( attachment.caption ) {
|
|
|
|
shortcode = {
|
|
|
|
id: 'attachment_' + attachment.id,
|
|
|
|
width: img.width
|
|
|
|
};
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
if ( props.align )
|
|
|
|
shortcode.align = 'align' + props.align;
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
html = wp.shortcode.string({
|
|
|
|
tag: 'caption',
|
|
|
|
attrs: shortcode,
|
|
|
|
content: html + ' ' + attachment.caption
|
|
|
|
});
|
|
|
|
}
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
2012-11-14 04:31:53 -05:00
|
|
|
return html;
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
wp.media.gallery = (function() {
|
|
|
|
var galleries = {};
|
|
|
|
|
|
|
|
return {
|
2012-11-14 04:06:10 -05:00
|
|
|
defaults: {
|
|
|
|
order: 'ASC',
|
|
|
|
orderby: 'post__in',
|
|
|
|
id: wp.media.view.settings.postId,
|
|
|
|
itemtag: 'dl',
|
|
|
|
icontag: 'dt',
|
|
|
|
captiontag: 'dd',
|
|
|
|
columns: 3,
|
|
|
|
size: 'thumbnail'
|
|
|
|
},
|
|
|
|
|
|
|
|
attachments: function( shortcode ) {
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
var shortcodeString = shortcode.string(),
|
|
|
|
result = galleries[ shortcodeString ],
|
|
|
|
attrs, args, query, others;
|
|
|
|
|
|
|
|
delete galleries[ shortcodeString ];
|
|
|
|
|
|
|
|
if ( result )
|
|
|
|
return result;
|
|
|
|
|
|
|
|
attrs = shortcode.attrs.named;
|
|
|
|
args = _.pick( attrs, 'orderby', 'order' );
|
|
|
|
|
|
|
|
args.type = 'image';
|
|
|
|
args.perPage = -1;
|
|
|
|
|
|
|
|
// Map the `ids` param to the correct query args.
|
|
|
|
if ( attrs.ids ) {
|
|
|
|
args.post__in = attrs.ids.split(',');
|
|
|
|
args.orderby = 'post__in';
|
|
|
|
} else if ( attrs.include ) {
|
|
|
|
args.post__in = attrs.include.split(',');
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( attrs.exclude )
|
|
|
|
args.post__not_in = attrs.exclude.split(',');
|
|
|
|
|
|
|
|
if ( ! args.post__in )
|
2012-11-14 04:06:10 -05:00
|
|
|
args.parent = attrs.id;
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
|
|
|
|
// Collect the attributes that were not included in `args`.
|
|
|
|
others = {};
|
|
|
|
_.filter( attrs, function( value, key ) {
|
|
|
|
if ( _.isUndefined( args[ key ] ) )
|
|
|
|
others[ key ] = value;
|
|
|
|
});
|
|
|
|
|
|
|
|
query = media.query( args );
|
|
|
|
query.gallery = new Backbone.Model( others );
|
|
|
|
return query;
|
|
|
|
},
|
|
|
|
|
|
|
|
shortcode: function( attachments ) {
|
|
|
|
var props = attachments.props.toJSON(),
|
|
|
|
attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
|
|
|
|
shortcode, clone;
|
|
|
|
|
|
|
|
if ( attachments.gallery )
|
|
|
|
_.extend( attrs, attachments.gallery.toJSON() );
|
|
|
|
|
|
|
|
attrs.ids = attachments.pluck('id');
|
|
|
|
|
|
|
|
// If the `ids` attribute is set and `orderby` attribute
|
|
|
|
// is the default value, clear it for cleaner output.
|
|
|
|
if ( attrs.ids && 'post__in' === attrs.orderby )
|
|
|
|
delete attrs.orderby;
|
|
|
|
|
|
|
|
shortcode = new wp.shortcode({
|
|
|
|
tag: 'gallery',
|
|
|
|
attrs: attrs,
|
|
|
|
type: 'single'
|
|
|
|
});
|
|
|
|
|
|
|
|
// Use a cloned version of the gallery.
|
|
|
|
clone = new wp.media.model.Attachments( attachments.models, {
|
|
|
|
props: props
|
|
|
|
});
|
|
|
|
clone.gallery = attachments.gallery;
|
|
|
|
galleries[ shortcode.string() ] = clone;
|
|
|
|
|
|
|
|
return shortcode;
|
2012-11-14 04:06:10 -05:00
|
|
|
},
|
|
|
|
|
|
|
|
edit: function( content ) {
|
|
|
|
var shortcode = wp.shortcode.next( 'gallery', content ),
|
|
|
|
defaultPostId = wp.media.gallery.defaults.postId,
|
|
|
|
attachments, selection;
|
|
|
|
|
|
|
|
// Bail if we didn't match the shortcode or all of the content.
|
|
|
|
if ( ! shortcode || shortcode.content !== content )
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Ignore the rest of the match object.
|
|
|
|
shortcode = shortcode.shortcode;
|
|
|
|
|
|
|
|
if ( _.isUndefined( shortcode.get('id') ) && ! _.isUndefined( defaultPostId ) )
|
|
|
|
shortcode.set( 'id', defaultPostId );
|
|
|
|
|
|
|
|
attachments = wp.media.gallery.attachments( shortcode );
|
|
|
|
|
|
|
|
selection = new wp.media.model.Selection( attachments.models, {
|
|
|
|
props: attachments.props.toJSON(),
|
|
|
|
multiple: true
|
|
|
|
});
|
|
|
|
|
|
|
|
selection.gallery = attachments.gallery;
|
|
|
|
|
|
|
|
return wp.media({
|
|
|
|
frame: 'post',
|
|
|
|
state: 'gallery-edit',
|
|
|
|
title: wp.media.view.l10n.editGalleryTitle,
|
|
|
|
editing: true,
|
|
|
|
multiple: true,
|
|
|
|
selection: selection
|
|
|
|
});
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
}());
|
|
|
|
|
|
|
|
wp.media.editor = {
|
2012-09-27 00:09:43 -04:00
|
|
|
insert: send_to_editor,
|
|
|
|
|
|
|
|
add: function( id, options ) {
|
|
|
|
var workflow = this.get( id );
|
|
|
|
|
|
|
|
if ( workflow )
|
|
|
|
return workflow;
|
|
|
|
|
|
|
|
workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
|
2012-11-09 04:59:36 -05:00
|
|
|
frame: 'post',
|
2012-09-27 02:20:22 -04:00
|
|
|
title: wp.media.view.l10n.insertMedia,
|
2012-10-28 19:29:17 -04:00
|
|
|
multiple: true
|
2012-09-27 00:09:43 -04:00
|
|
|
} ) );
|
|
|
|
|
2012-11-08 20:44:02 -05:00
|
|
|
workflow.on( 'insert', function( selection ) {
|
2012-11-08 09:15:09 -05:00
|
|
|
var state = workflow.state(),
|
|
|
|
details = state.get('details');
|
|
|
|
|
2012-11-08 20:44:02 -05:00
|
|
|
selection = selection || state.get('selection');
|
|
|
|
|
2012-11-08 09:15:09 -05:00
|
|
|
if ( ! selection || ! details )
|
|
|
|
return;
|
|
|
|
|
2012-10-10 17:54:21 -04:00
|
|
|
this.insert( selection.map( function( attachment ) {
|
2012-11-08 09:15:09 -05:00
|
|
|
var detail = details[ attachment.cid ];
|
|
|
|
|
|
|
|
if ( detail )
|
|
|
|
detail = detail.toJSON();
|
|
|
|
|
2012-11-10 15:36:46 -05:00
|
|
|
// Reset the attachment details.
|
|
|
|
delete details[ attachment.cid ];
|
|
|
|
|
2012-10-10 17:54:21 -04:00
|
|
|
if ( 'image' === attachment.get('type') )
|
2012-11-08 09:15:09 -05:00
|
|
|
return wp.media.string.image( attachment, detail ) + ' ';
|
2012-10-10 17:54:21 -04:00
|
|
|
else
|
2012-11-10 15:36:46 -05:00
|
|
|
return wp.media.string.link( attachment, detail ) + ' ';
|
2012-10-10 17:54:21 -04:00
|
|
|
}).join('') );
|
2012-09-27 00:09:43 -04:00
|
|
|
}, this );
|
|
|
|
|
2012-11-07 15:14:41 -05:00
|
|
|
workflow.get('gallery-edit').on( 'update', function( selection ) {
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
this.insert( wp.media.gallery.shortcode( selection ).string() );
|
Use the new media modal to insert galleries into TinyMCE and the text editor.
'''Galleries'''
* Gallery insertion from the new media modal (into TinyMCE, the text editor, etc).
* Gallery previews in TinyMCE now use the `wp.mce.views` API.
* Disables the TinyMCE `wpgallery` plugin.
* Gallery previews consist of the first image of the gallery and the appearance of a stack. This will later be fleshed out to include more images/functionality (including editing the gallery, gallery properties, and showing the number of images in the gallery).
* Multiple galleries can be added to a single post.
* The gallery MCE view provides a bridge between the `wp.shortcode` and `Attachments` representation of a gallery, which allows the existing collection to persist when a gallery is initially created (preventing a request to the server for the query).
'''Shortcodes'''
* Renames `wp.shortcode.Match` to `wp.shortcode` to better expose the shortcode constructor.
* The `wp.shortcode` constructor now accepts an object of options instead of a `wp.shortcode.regexp()` match.
* A `wp.shortcode` instance can be created from a `wp.shortcode.regexp()` match by calling `wp.shortcode.fromMatch( match )`.
* Adds `wp.shortcode.string()`, which takes a set of shortcode parameters and converts them into a string.* Renames `wp.shortcode.prototype.text()` to `wp.shortcode.prototype.string()`.
* Adds an additional capture group to `wp.shortcode.regexp()` that records whether or not the shortcode has a closing tag. This allows us to improve the accuracy of the syntax used when transforming a shortcode object back into a string.
'''Media Models'''
* Prevents media `Query` models from observing the central `Attachments.all` object when query args without corresponding filters are set (otherwise, queries quickly amass false positives).
* Adds `post__in`, `post__not_in`, and `post_parent` as acceptable JS attachment `Query` args.
* `Attachments.more()` always returns a `$.promise` object.
see #21390, #21809, #21812, #21815, #21817.
git-svn-id: http://core.svn.wordpress.org/trunk@22120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-05 00:23:59 -04:00
|
|
|
}, this );
|
|
|
|
|
2012-11-12 00:57:12 -05:00
|
|
|
workflow.get('embed').on( 'select', function() {
|
|
|
|
var embed = workflow.state().toJSON(),
|
|
|
|
options;
|
|
|
|
|
|
|
|
if ( 'link' === embed.type ) {
|
|
|
|
this.insert( wp.html.string({
|
|
|
|
tag: 'a',
|
|
|
|
content: embed.title || embed.url,
|
|
|
|
attrs: {
|
|
|
|
href: embed.url
|
|
|
|
}
|
|
|
|
}) );
|
|
|
|
|
|
|
|
} else if ( 'image' === embed.type ) {
|
|
|
|
_.defaults( embed, {
|
|
|
|
align: 'none',
|
|
|
|
url: '',
|
|
|
|
alt: '',
|
|
|
|
linkUrl: '',
|
|
|
|
link: 'none'
|
|
|
|
});
|
|
|
|
|
|
|
|
options = {
|
|
|
|
single: true,
|
|
|
|
tag: 'img',
|
|
|
|
attrs: {
|
|
|
|
'class': 'align' + embed.align,
|
|
|
|
src: embed.url,
|
|
|
|
alt: embed.alt
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if ( 'custom' === embed.link || 'file' === embed.link ) {
|
|
|
|
options = {
|
|
|
|
tag: 'a',
|
|
|
|
content: options,
|
|
|
|
attrs: {
|
|
|
|
href: 'custom' === embed.link ? embed.linkUrl : embed.url
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
this.insert( wp.html.string( options ) );
|
|
|
|
}
|
|
|
|
}, this );
|
|
|
|
|
2012-09-27 00:09:43 -04:00
|
|
|
return workflow;
|
|
|
|
},
|
|
|
|
|
|
|
|
get: function( id ) {
|
|
|
|
return workflows[ id ];
|
|
|
|
},
|
|
|
|
|
|
|
|
remove: function( id ) {
|
|
|
|
delete workflows[ id ];
|
|
|
|
},
|
|
|
|
|
|
|
|
init: function() {
|
2012-11-09 23:39:44 -05:00
|
|
|
$('#wpbody').on('click', '.insert-media', function( event ) {
|
2012-09-27 00:09:43 -04:00
|
|
|
var editor = $(this).data('editor'),
|
|
|
|
workflow;
|
|
|
|
|
|
|
|
event.preventDefault();
|
|
|
|
|
|
|
|
if ( ! editor )
|
|
|
|
return;
|
|
|
|
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
workflow = wp.media.editor.get( editor );
|
2012-09-27 00:09:43 -04:00
|
|
|
|
|
|
|
// If the workflow exists, just open it.
|
|
|
|
if ( workflow ) {
|
|
|
|
workflow.open();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize the editor's workflow if we haven't yet.
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
wp.media.editor.add( editor );
|
2012-09-27 00:09:43 -04:00
|
|
|
});
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.
When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.
fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 02:17:22 -05:00
|
|
|
$( wp.media.editor.init );
|
2012-09-27 00:09:43 -04:00
|
|
|
}(jQuery));
|