Changeset 28775

Timestamp:

06/18/2014 11:02:10 PM (10 years ago)

Author:

wonderboymusic

Message:

Diambiguate type and shortcode in TinyMCE view classes and their attached view.View class. Has the added feature of not causing JS errors.

See #28532.

File:

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

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

@@ -125 +125 @@
         register: function( type, constructor ) {
             var defaultConstructor = {
-                    shortcode: type,
+                    type: type,
                     View: {},
                     toView: function( content ) {
-                        var match = wp.shortcode.next( this.shortcode, content );
+                        var match = wp.shortcode.next( this.type, content );
 
                         if ( ! match ) {
@@ -489 +489 @@
          */
         edit: function( node ) {
-            var media = wp.media[ this.shortcode ],
+            var media = wp.media[ this.type ],
                 self = this,
                 frame, data, callback;
@@ -502 +502 @@
 
             callback = function( selection ) {
-                var shortcode = wp.media[ self.shortcode ].shortcode( selection ).string();
+                var shortcode = wp.media[ self.type ].shortcode( selection ).string();
                 $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
                 wp.mce.views.refreshView( self, shortcode );
@@ -820 +820 @@
                 frame,
                 data,
-                isURL = 'embedURL' === this.shortcode;
+                isURL = 'embedURL' === this.type;
 
             $( document ).trigger( 'media:edit' );