From faec132f8201d4dfedce4896ccff93d5d2efa4f6 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 12 Oct 2018 10:28:36 +0200 Subject: [PATCH] TEMP - removes inline mode adds stub code to have a fixed toolbar dom item --- .../src/common/services/tinymce.service.js | 3 ++- src/Umbraco.Web.UI.Client/src/less/rte.less | 3 +++ .../src/views/propertyeditors/rte/rte.html | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 266b50fdcb..246d5c297a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -186,9 +186,10 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh //create a baseline Config to exten upon var config = { + //fixed_toolbar_container: "#blah", selector: "#" + args.htmlId, theme: args.theme ? args.theme : "modern", - inline: true, + //inline: true, plugins: plugins, valid_elements: tinyMceConfig.validElements, invalid_elements: tinyMceConfig.inValidElements, diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less index e0296f63c0..a6d1779a5e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/rte.less +++ b/src/Umbraco.Web.UI.Client/src/less/rte.less @@ -35,6 +35,9 @@ background-position-x: 99%; } +.umb-rte .mce-container { + white-space: inherit; +} /* This used to be in place but I'm not sure its needed ... */ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html index c3add7694a..3aa342b1ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html @@ -2,6 +2,8 @@
Loading...
+
+