WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues 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. 

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 ) {
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' );

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

File diff suppressed because one or more lines are too long