Changeset 31612

Timestamp:

03/04/2015 08:34:35 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE wpView: decode HTML entities before trying to insert view markers. Props iseulde. See #31412.

File:

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

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

@@ -29 +29 @@
 
     var views = {},
-        instances = {};
+        instances = {},
+        textarea = document.createElement( 'textarea' );
 
     wp.mce = wp.mce || {};
+
+    /**
+     * Decode HTML entities in a givin string.
+     *
+     * @param {String} html The string to decode.
+     */
+    function decodeHTML( html ) {
+        textarea.innerHTML = html;
+        html = textarea.value;
+
+        textarea.innerHTML = textarea.value = '';
+
+        return html;
+    }
 
     /**
@@ -90 +105 @@
          */
         setMarkers: function( content ) {
-            var pieces = [ { content: content } ],
+            var pieces = [ { content: decodeHTML( content ) } ],
                 self = this,
                 current;
@@ -391 +406 @@
         replaceMarkers: function() {
             this.getMarkers( function( editor, node ) {
-                if ( $( node ).html() !== this.text ) {
+                if ( $( node ).text() !== this.text ) {
                     editor.dom.setAttrib( node, 'data-wpview-marker', null );
                     return;