From e3e425695f724cbbf1b25e2dfe97d90d8cdcd9f2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 16 Mar 2018 16:34:58 +0100 Subject: [PATCH] U4-8724 tinyMceConfig.config customConfig bool not correct deserialized --- .../common/directives/components/grid/grid.rte.directive.js | 6 ++++++ .../src/views/propertyeditors/rte/rte.controller.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js index 90daac73db..e18137085b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js @@ -145,6 +145,12 @@ angular.module("umbraco.directives") } } } + if (val === "true") { + tinyMceConfig.customConfig[i] = true; + } + if (val === "false") { + tinyMceConfig.customConfig[i] = false; + } } angular.extend(baseLineConfigObj, tinyMceConfig.customConfig); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 0a6bededae..f886c60bc1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -185,6 +185,12 @@ angular.module("umbraco") //cannot parse, we'll just leave it } } + if (val === "true") { + tinyMceConfig.customConfig[i] = true; + } + if (val === "false") { + tinyMceConfig.customConfig[i] = false; + } } }