Changeset 28689

Timestamp:

06/06/2014 02:21:12 PM (10 years ago)

Author:

wonderboymusic

Message:

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.

See #28458.

File:

• trunk/src/wp-includes/js/mce-view.js (modified) (5 diffs)

trunk/src/wp-includes/js/mce-view.js

@@ -77 +77 @@
         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 ) {
@@ -482 +482 @@
      */
     wp.mce.views.register( 'video', _.extend( {}, wp.mce.av, {
-        shortcode: 'video',
         state: 'video-details',
         View: _.extend( {}, wp.mce.av.View, {
@@ -495 +494 @@
      */
     wp.mce.views.register( 'audio', _.extend( {}, wp.mce.av, {
-        shortcode: 'audio',
         state: 'audio-details',
         View: _.extend( {}, wp.mce.av.View, {
@@ -508 +506 @@
      */
     wp.mce.views.register( 'playlist', _.extend( {}, wp.mce.av, {
-        shortcode: 'playlist',
         state: ['playlist-edit', 'video-playlist-edit'],
         View: _.extend( {}, wp.media.mixin, {
@@ -639 +636 @@
      */
     wp.mce.views.register( 'embed', {
-        shortcode: 'embed',
         View: _.extend( {}, wp.media.mixin, {
             template: media.template( 'editor-embed' ),