MC-30586: TinyMCE4: some HTML code breaks the editor

Oleksandr Dubovyk · Oleksandr Dubovyk · commit 5635217df265 · 2020-01-30T12:59:25.000-06:00
-fixed
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -171,9 +171,13 @@ define([
                             widgetCode;
 
                         if (attributes.id) {
-                            widgetCode = Base64.idDecode(attributes.id);
+                            try {
+                                widgetCode = Base64.idDecode(attributes.id);
+                            } catch (e) {
+                                // Ignore and continue.
+                            }
 
-                            if (widgetCode.indexOf('{{widget') !== -1) {
+                            if (widgetCode && widgetCode.indexOf('{{widget') !== -1) {
                                 return widgetCode;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,13 @@ define([`
`171`	`171`	`widgetCode;`
`172`	`172`
`173`	`173`	`if (attributes.id) {`
`174`		`- widgetCode = Base64.idDecode(attributes.id);`
	`174`	`+ try {`
	`175`	`+ widgetCode = Base64.idDecode(attributes.id);`
	`176`	`+ } catch (e) {`
	`177`	`+ // Ignore and continue.`
	`178`	`+ }`
`175`	`179`
`176`		`- if (widgetCode.indexOf('{{widget') !== -1) {`
	`180`	`+ if (widgetCode && widgetCode.indexOf('{{widget') !== -1) {`
`177`	`181`	`return widgetCode;`
`178`	`182`	`}`
`179`	`183`	`}`