diff --git a/wp-includes/js/mce-view.js b/wp-includes/js/mce-view.js index c2db6cef88..4a7b96b1c6 100644 --- a/wp-includes/js/mce-view.js +++ b/wp-includes/js/mce-view.js @@ -461,8 +461,7 @@ window.wp = window.wp || {}; * @param {Boolean} rendered Only set for (un)rendered nodes. Optional. */ setIframes: function( head, body, callback, rendered ) { - var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver, - importStyles = this.type === 'video' || this.type === 'audio' || this.type === 'playlist'; + var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver; this.getNodes( function( editor, node, content ) { // Seems Firefox needs a bit of time to insert/set the view nodes, @@ -473,21 +472,18 @@ window.wp = window.wp || {}; bodyClasses = editor.getBody().className || '', iframe, iframeDoc, observer, i; - if ( importStyles ) { - if ( ! wp.mce.views.sandboxStyles ) { - tinymce.each( dom.$( 'link[rel="stylesheet"]', editor.getDoc().head ), function( link ) { - if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 && - link.href.indexOf( 'skins/wordpress/wp-content.css' ) === -1 ) { - - styles += dom.getOuterHTML( link ) + '\n'; - } - }); - - wp.mce.views.sandboxStyles = styles; - } else { - styles = wp.mce.views.sandboxStyles; + tinymce.each( dom.$( + 'link[rel="stylesheet"]', + editor.getDoc().getElementsByTagName( 'head' )[0] + ), function( link ) { + if ( + link.href && + link.href.indexOf( 'skins/lightgray/content.min.css' ) >= 0 && + link.href.indexOf( 'skins/wordpress/wp-content.css' ) >= 0 + ) { + styles += dom.getOuterHTML( link ); } - } + } ); content.innerHTML = ''; @@ -580,13 +576,11 @@ window.wp = window.wp || {}; iframeDoc.body.className = editor.getBody().className; } - if ( importStyles ) { - editor.on( 'wp-body-class-change', classChange ); + editor.on( 'wp-body-class-change', classChange ); - $( node ).one( 'wp-mce-view-unbind', function() { - editor.off( 'wp-body-class-change', classChange ); - } ); - } + $( node ).one( 'wp-mce-view-unbind', function() { + editor.off( 'wp-body-class-change', classChange ); + } ); callback && callback.apply( this, arguments ); }, 50 ); diff --git a/wp-includes/js/mce-view.min.js b/wp-includes/js/mce-view.min.js index 79d1c51dc8..a8afa9ae53 100644 --- a/wp-includes/js/mce-view.min.js +++ b/wp-includes/js/mce-view.min.js @@ -1 +1 @@ -window.wp=window.wp||{},function(a,b,c){"use strict";var d={},e={};b.mce=b.mce||{},b.mce.views={register:function(a,c){d[a]=b.mce.View.extend(_.extend(c,{type:a}))},unregister:function(a){delete d[a]},get:function(a){return d[a]},unbind:function(){_.each(e,function(a){a.unbind()})},setMarkers:function(a){var b,c,e=[{content:a}],f=this;return _.each(d,function(a,d){c=e.slice(),e=[],_.each(c,function(c){var g,h=c.content;if(c.processed)return void e.push(c);for(;h&&(g=a.prototype.match(h));)g.index&&e.push({content:h.substring(0,g.index)}),b=f.createInstance(d,g.content,g.options),e.push({content:'
'+b.text+"
",processed:!0}),h=h.slice(g.index+g.content.length);h&&e.push({content:h})})}),_.pluck(e,"content").join("")},createInstance:function(a,b,c){var d,f,g=this.get(a);return b=tinymce.DOM.decode(b),d=encodeURIComponent(b),(f=this.getInstance(d))?f:(c=_.extend(c||{},{text:b,encodedText:d}),e[d]=new g(c))},getInstance:function(a){return"string"==typeof a?e[encodeURIComponent(a)]:e[c(a).attr("data-wpview-text")]},getText:function(a){return decodeURIComponent(c(a).attr("data-wpview-text")||"")},render:function(a){_.each(e,function(b){b.render(a)})},update:function(a,b,c){var d=this.getInstance(c);d&&d.update(a,b,c)},edit:function(a,b){var c=this.getInstance(b);c&&c.edit&&c.edit(c.text,function(d){c.update(d,a,b)})},remove:function(a,b){var c=this.getInstance(b);c&&c.remove(a,b)}},b.mce.View=function(a){_.extend(this,a),this.initialize()},b.mce.View.extend=Backbone.View.extend,_.extend(b.mce.View.prototype,{content:null,loader:!0,initialize:function(){},getContent:function(){return this.content},render:function(a){(this.loader||this.getContent())&&(a&&this.unbind(),this.replaceMarkers(),this.getContent()?this.setContent(this.getContent(),function(a,b){c(b).data("rendered",!0).trigger("wp-mce-view-bind")},a?null:!1):this.setLoader())},unbind:function(){this.getNodes(function(a,b){c(b).trigger("wp-mce-view-unbind")},!0)},getEditors:function(a){_.each(tinymce.editors,function(b){b.plugins.wpview&&a.call(this,b)},this)},getNodes:function(a,b){this.getEditors(function(d){var e=this;c(d.getBody()).find('[data-wpview-text="'+e.encodedText+'"]').filter(function(){var a;return null==b?!0:(a=c(this).data("rendered")===!0,b?a:!a)}).each(function(){a.call(e,d,this,c(this).find(".wpview-content").get(0))})})},getMarkers:function(a){this.getEditors(function(b){var d=this;c(b.getBody()).find('[data-wpview-marker="'+this.encodedText+'"]').each(function(){a.call(d,b,this)})})},replaceMarkers:function(){this.getMarkers(function(a,b){return c(b).text()!==this.text?void a.dom.setAttrib(b,"data-wpview-marker",null):void a.dom.replace(a.dom.createFragment('