From 9642d17ff82cb0569a15e79adc0f352b6721141a Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Wed, 18 Jun 2014 23:02:10 +0000
Subject: [PATCH] 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@28775 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/mce-view.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/js/mce-view.js b/src/wp-includes/js/mce-view.js
index 9dfef40034..feb7607e2a 100644
--- a/src/wp-includes/js/mce-view.js
+++ b/src/wp-includes/js/mce-view.js
@@ -124,10 +124,10 @@ window.wp = window.wp || {};
 		 */
 		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 ) {
 							return;
@@ -488,7 +488,7 @@ window.wp = window.wp || {};
 		 * @param {HTMLElement} node
 		 */
 		edit: function( node ) {
-			var media = wp.media[ this.shortcode ],
+			var media = wp.media[ this.type ],
 				self = this,
 				frame, data, callback;
 
@@ -501,7 +501,7 @@ window.wp = window.wp || {};
 			} );
 
 			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 );
 				frame.detach();
@@ -819,7 +819,7 @@ window.wp = window.wp || {};
 				self = this,
 				frame,
 				data,
-				isURL = 'embedURL' === this.shortcode;
+				isURL = 'embedURL' === this.type;
 
 			$( document ).trigger( 'media:edit' );