IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
See #28532.

Built from https://develop.svn.wordpress.org/trunk@28775


git-svn-id: http://core.svn.wordpress.org/trunk@28588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-18 23:03:15 +00:00
parent c504fb41a1
commit 9834317785
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/js/mce-view.js
View File

@ -124,10 +124,10 @@ window.wp = window.wp || {};
*/ */
register: function( type, constructor ) { register: function( type, constructor ) {
var defaultConstructor = { var defaultConstructor = {
shortcode: type, type: type,
View: {}, View: {},
toView: function( content ) { toView: function( content ) {
var match = wp.shortcode.next( this.shortcode, content ); var match = wp.shortcode.next( this.type, content );
if ( ! match ) { if ( ! match ) {
return; return;
@ -488,7 +488,7 @@ window.wp = window.wp || {};
* @param {HTMLElement} node * @param {HTMLElement} node
*/ */
edit: function( node ) { edit: function( node ) {
var media = wp.media[ this.shortcode ], var media = wp.media[ this.type ],
self = this, self = this,
frame, data, callback; frame, data, callback;
@ -501,7 +501,7 @@ window.wp = window.wp || {};
} ); } );
callback = function( selection ) { 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 ) ); $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
wp.mce.views.refreshView( self, shortcode ); wp.mce.views.refreshView( self, shortcode );
frame.detach(); frame.detach();
@ -819,7 +819,7 @@ window.wp = window.wp || {};
self = this, self = this,
frame, frame,
data, data,
isURL = 'embedURL' === this.shortcode; isURL = 'embedURL' === this.type;
$( document ).trigger( 'media:edit' ); $( document ).trigger( 'media:edit' );

2
wp-includes/js/mce-view.min.js vendored
View File

File diff suppressed because one or more lines are too long