sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

As per @gcorne's suggestion, when calling wp.mce.views.register(), automatically set shortcode equal to the passed type in the set of default args instead of introducing a type property. It is still overrideable by the args that are passed.

Browse Source 
See #28458.



git-svn-id: https://develop.svn.wordpress.org/trunk@28689 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-06-06 14:21:12 +00:00
parent 655d03da0a
commit 60cf850c00
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/js/mce-view.js
View File

@ -76,10 +76,10 @@ window.wp = window.wp || {};
*/
register: function( type, constructor ) {
var defaultConstructor = {
type: type,
shortcode: type,
View: {},
toView: function( content ) {
var match = wp.shortcode.next( this.type, content );
var match = wp.shortcode.next( this.shortcode, content );
if ( ! match ) {
return;
@ -481,7 +481,6 @@ window.wp = window.wp || {};
* @mixes wp.mce.av
*/
wp.mce.views.register( 'video', _.extend( {}, wp.mce.av, {
shortcode: 'video',
state: 'video-details',
View: _.extend( {}, wp.mce.av.View, {
template: media.template( 'editor-video' )
@ -494,7 +493,6 @@ window.wp = window.wp || {};
* @mixes wp.mce.av
*/
wp.mce.views.register( 'audio', _.extend( {}, wp.mce.av, {
shortcode: 'audio',
state: 'audio-details',
View: _.extend( {}, wp.mce.av.View, {
template: media.template( 'editor-audio' )
@ -507,7 +505,6 @@ window.wp = window.wp || {};
* @mixes wp.mce.av
*/
wp.mce.views.register( 'playlist', _.extend( {}, wp.mce.av, {
shortcode: 'playlist',
state: ['playlist-edit', 'video-playlist-edit'],
View: _.extend( {}, wp.media.mixin, {
template: media.template( 'editor-playlist' ),
@ -638,7 +635,6 @@ window.wp = window.wp || {};
* TinyMCE handler for the embed shortcode
*/
wp.mce.views.register( 'embed', {
shortcode: 'embed',
View: _.extend( {}, wp.media.mixin, {
template: media.template( 'editor-embed' ),
initialize: function( options ) {