From 1fc1de9c73fd67d30af2b9d60a9dbb9814273180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 26 Sep 2019 13:13:38 +0200 Subject: [PATCH 1/2] lets not set a specific width, but do it by CSS. --- .../src/common/services/tinymce.service.js | 7 ++----- .../src/less/components/umb-grid.less | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) 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 2a4f12c4d4..6b3cb5281f 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 @@ -1172,7 +1172,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s var tinyMceRect = editor.editorContainer.getBoundingClientRect(); var tinyMceTop = tinyMceRect.top; var tinyMceBottom = tinyMceRect.bottom; - var tinyMceWidth = tinyMceRect.width; var tinyMceEditArea = tinyMce.find(".mce-edit-area"); @@ -1184,15 +1183,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s .css("visibility", "visible") .css("position", "fixed") .css("top", "177px") - .css("margin-top", "0") - .css("width", tinyMceWidth); + .css("margin-top", "0"); } else { toolbar .css("visibility", "visible") .css("position", "absolute") .css("top", "auto") - .css("margin-top", "0") - .css("width", tinyMceWidth); + .css("margin-top", "0"); } }, diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less index 852f4411d5..d8df0332ec 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less @@ -657,6 +657,8 @@ // had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space. .umb-grid .mce-container > div { white-space: normal; + left:0; + right:0; } From 6793167865ecc7718943b57f3812165852a80e5b Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 26 Sep 2019 14:25:06 +0200 Subject: [PATCH 2/2] fixes brackets --- src/Umbraco.Core/Mapping/UmbracoMapper.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs index cfcb6c1561..e41a40e3d9 100644 --- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs +++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs @@ -232,10 +232,10 @@ namespace Umbraco.Core.Mapping if (ctor != null && map != null) { // register (for next time) and do it now (for this time) - object NCtor(object s, MapperContext c) => MapEnumerableInternal((IEnumerable) s, targetGenericArg, ctor, map, c); + object NCtor(object s, MapperContext c) => MapEnumerableInternal((IEnumerable)s, targetGenericArg, ctor, map, c); DefineCtors(sourceType)[targetType] = NCtor; DefineMaps(sourceType)[targetType] = Identity; - return (TTarget) NCtor(source, context); + return (TTarget)NCtor(source, context); } throw new InvalidOperationException($"Don't know how to map {sourceGenericArg.FullName} to {targetGenericArg.FullName}, so don't know how to map {sourceType.FullName} to {targetType.FullName}."); @@ -266,7 +266,7 @@ namespace Umbraco.Core.Mapping target = targetArray; } - return (TTarget) target; + return (TTarget)target; } /// @@ -344,12 +344,16 @@ namespace Umbraco.Core.Mapping if (ctor == null) return null; if (_ctors.ContainsKey(sourceType)) + { foreach (var c in sourceCtor) + { if (!_ctors[sourceType].TryGetValue(c.Key, out _)) _ctors[sourceType].Add(c.Key, c.Value); + } + } else _ctors[sourceType] = sourceCtor; - + return ctor; } @@ -375,12 +379,16 @@ namespace Umbraco.Core.Mapping if (map == null) return null; if (_maps.ContainsKey(sourceType)) - foreach(var m in sourceMap) + { + foreach (var m in sourceMap) + { if (!_maps[sourceType].TryGetValue(m.Key, out _)) _maps[sourceType].Add(m.Key, m.Value); + } + } else _maps[sourceType] = sourceMap; - + return map; }