Merge remote-tracking branch 'tango-ce/MAGETWO-52674' into MAGETWO-52779

Author: magicbunneh

lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js

@@ -26,10 +26,11 @@ define([
             this.id = htmlId;
             this.config = config;
 
-            _.bindAll(this, 'beforeSetContent', 'saveContent', 'onChangeContent', 'openFileBrowser');
+            _.bindAll(this, 'beforeSetContent', 'saveContent', 'onChangeContent', 'openFileBrowser', 'updateTextArea');
 
             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
             varienGlobalEvents.attachEventHandler('tinymceBeforeSetContent', this.beforeSetContent);
+            varienGlobalEvents.attachEventHandler('tinymceSetContent', this.updateTextArea);
             varienGlobalEvents.attachEventHandler('tinymceSaveContent', this.saveContent);
 
             if (typeof tinyMceEditors == 'undefined') {
@@ -366,7 +367,7 @@ define([
             return result;
         },
 
-        encodeConetent: function (content) {
+        encodeContent: function (content) {
             var result = content;
 
             if (this.config.add_widgets) {
@@ -380,7 +381,7 @@ define([
         },
 
         beforeSetContent: function(o){
-            o.content = this.encodeConetent(o.content);
+            o.content = this.encodeContent(o.content);
         },
 
         saveContent: function(o) {