Merge branch 'v8/8.2' into v8/dev

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<TTarget>((IEnumerable) s, targetGenericArg, ctor, map, c);
+                    object NCtor(object s, MapperContext c) => MapEnumerableInternal<TTarget>((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;
         }
 
         /// <summary>
@@ -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;
         }
 

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");
             }
 
         },

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;
 }