From ac1d462bc5286114a78b280cd0e58d1f601d9eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 10 Apr 2019 14:52:16 +0200
Subject: [PATCH 01/56] ability to remove tag by pressing delete or backspace

---
 .../directives/components/tags/umbtagseditor.directive.js  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 40def728ed..7d1def43a8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -41,6 +41,7 @@
         vm.removeTag = removeTag;
         vm.showPrompt = showPrompt;
         vm.hidePrompt = hidePrompt;
+        vm.onKeyUpOnTag = onKeyUpOnTag;
 
         vm.htmlId = "t" + String.CreateGuid();
         vm.isLoading = true;
@@ -272,6 +273,12 @@
             vm.promptIsVisible = "-1";
         }
         
+        function onKeyUpOnTag(tag, $event) {
+            if ($event.keyCode === 8 || $event.keyCode === 46) {
+                removeTag(tag);
+            }
+        }
+        
         // helper method to remove current tags
         function removeCurrentTagsFromSuggestions(suggestions) {
             return $.grep(suggestions, function (suggestion) {

From f8af9fd895b4af1985167e6813d4b008b6f97117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 10 Apr 2019 14:52:39 +0200
Subject: [PATCH 02/56] correct spacing between properties

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index c666a69166..9f9bbce310 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -118,7 +118,6 @@ h5.-black {
 .umb-control-group {
   border-bottom: 1px solid @gray-11;
   padding-bottom: 20px;
-  margin-bottom: 15px !important;
 }
 
 .umb-control-group.-no-border {

From 7afd01ff5c15715dcd9b5bde67c93f5ce1b895df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 10 Apr 2019 14:52:54 +0200
Subject: [PATCH 03/56] Styling update for umb-tags

---
 .../src/less/property-editors.less            | 34 +++++++++++++------
 .../src/less/typeahead.less                   |  6 ++--
 .../components/tags/umb-tags-editor.html      |  2 +-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 9d2c3301fb..4b86947366 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -851,25 +851,28 @@
 //
 // Tags
 // --------------------------------------------------
-.umb-tags{
+.umb-tags {
     border: @inputBorder solid 1px;
-    padding: 10px;
+    padding: 5px;
+    min-height: 54px;
     font-size: 13px;
     text-shadow: none;
 
     .tag {
         cursor: default;
-        margin: 7px;
+        margin: 10px;
         padding: 10px;
-        background: @blueDark;
+        background: @blueExtraDark;
         position: relative;
-
-        .icon-trash{
-            cursor: pointer;
-            padding: 2px;
-            font-size: 12px;
+        user-select: all;
+        
+        .icon-trash {
             position: relative;
-            right: -6px;
+            cursor: pointer;
+            padding-left: 4px;
+            font-size: 15px;
+            right: -2px;
+            bottom: -1px;
         }
 
         .umb_confirm-action__overlay.-left{
@@ -879,10 +882,19 @@
         }
     }
 
-    input{
+    input {
         border: none;
         background: @white;
     }
+    
+    .twitter-typeahead {
+        margin: 10px;
+        margin-top: 16px;
+        vertical-align: top;
+        input {
+            padding-left: 0;
+        }
+    }
 }
 
 //
diff --git a/src/Umbraco.Web.UI.Client/src/less/typeahead.less b/src/Umbraco.Web.UI.Client/src/less/typeahead.less
index 884f44974a..4822605200 100644
--- a/src/Umbraco.Web.UI.Client/src/less/typeahead.less
+++ b/src/Umbraco.Web.UI.Client/src/less/typeahead.less
@@ -31,8 +31,8 @@
   padding: 8px 0;
   background-color: @white;
   border: 1px solid @gray-8;
-  border-radius: 8px;
-  box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  border-radius: 3px;
+  box-shadow: 0 3px 6px rgba(0,0,0,.16);
 }
 
 .tt-suggestion {
@@ -44,7 +44,7 @@
 
 .tt-suggestion.tt-cursor {
   color: @white;
-  background-color: @turquoise;
+  background-color: @ui-selected-type-hover;
 }
 
 .tt-suggestion p {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index 804a3516f8..9de5726341 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -8,7 +8,7 @@
 
             <input type="hidden" name="tagCount" ng-model="vm.viewModel.length" val-property-validator="vm.validateMandatory" />
 
-            <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag">
+            <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
                 <span ng-bind-html="tag"></span>
 
                 <i class="icon-trash" ng-click="vm.showPrompt($index, tag)" localize="title" title="@buttons_deleteTag"></i>

From 9ad5dad710e943a677040bf568d4f4a3648d511b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 10 Apr 2019 14:59:16 +0200
Subject: [PATCH 04/56] additional spacing added

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 4b86947366..a3a45d4001 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -861,7 +861,7 @@
     .tag {
         cursor: default;
         margin: 10px;
-        padding: 10px;
+        padding: 10px 15px;
         background: @blueExtraDark;
         position: relative;
         user-select: all;
@@ -869,9 +869,9 @@
         .icon-trash {
             position: relative;
             cursor: pointer;
-            padding-left: 4px;
+            padding-left: 2px;
             font-size: 15px;
-            right: -2px;
+            right: -5px;
             bottom: -1px;
         }
 

From 3b22480b5d36b75d0e7e8fcd831cf37b9f0bab57 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Mon, 15 Apr 2019 21:46:09 +0200
Subject: [PATCH 05/56] Update with correct paths

---
 src/ApiDocs/docfx.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 520622a0e0..0d0efe4f66 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -2,7 +2,8 @@
   "metadata": [
     {
       "src": [
-        {
+        { 
+          "src": "../",
           "files": [
             "Umbraco.Core/Umbraco.Core.csproj",
             "Umbraco.Web/Umbraco.Web.csproj"
@@ -11,12 +12,11 @@
             "**/obj/**",
             "**/bin/**",
             "_site/**"
-          ],
-          "cwd": "../src"
+          ]
         }
       ],
-      "dest": "../apidocs/api",
-      "filter": "../apidocs/docfx.filter.yml"
+      "dest": "api",
+      "filter": "docfx.filter.yml"
     }
   ],
   "build": {
@@ -72,4 +72,4 @@
       "default", "umbracotemplate"
     ]
   }
-}
\ No newline at end of file
+}

From dba241ef50b8fc7ca8997d82128643b8925ebc64 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:04:55 +0200
Subject: [PATCH 06/56] Adding build script for API docs

---
 build/build-docs.ps1 | 119 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 build/build-docs.ps1

diff --git a/build/build-docs.ps1 b/build/build-docs.ps1
new file mode 100644
index 0000000000..c1b2b22f03
--- /dev/null
+++ b/build/build-docs.ps1
@@ -0,0 +1,119 @@
+$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path);
+$RepoRoot = (get-item $PSScriptFilePath).Directory.Parent.FullName;
+$SolutionRoot = Join-Path -Path $RepoRoot "src";
+$ToolsRoot = Join-Path -Path $RepoRoot "\build\temp";
+$DocFx = Join-Path -Path $ToolsRoot "docfx\docfx.exe"
+$DocFxFolder = (Join-Path -Path $ToolsRoot "docfx")
+$DocFxJson = Join-Path -Path $SolutionRoot "ApiDocs\docfx.json"
+$7Zip = Join-Path -Path $ToolsRoot "7za.exe"
+$DocFxSiteOutput = Join-Path -Path $SolutionRoot "ApiDocs\_site\*.*"
+#$NgDocsSiteOutput = Join-Path -Path $RepoRoot "src\Umbraco.Web.UI.Client\docs\api\*.*"
+$ProgFiles86 = [Environment]::GetEnvironmentVariable("ProgramFiles(x86)");
+$MSBuild = "$ProgFiles86\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
+
+<#
+################ Do the UI docs
+
+"Changing to Umbraco.Web.UI.Client folder"
+cd ..
+cd src\Umbraco.Web.UI.Client
+Write-Host $(Get-Location)
+
+"Creating build folder so MSBuild doesn't run the whole grunt build"
+if (-Not (Test-Path "build")) {
+    md "build"
+}
+
+"Installing node"
+# Check if Install-Product exists, should only exist on the build server
+if (Get-Command Install-Product -errorAction SilentlyContinue)
+{
+    Install-Product node ''
+}
+
+"Installing node modules"
+& npm install
+
+"Installing grunt"
+& npm install -g grunt-cli
+
+"Moving back to build folder"
+cd ..
+cd ..
+cd build
+Write-Host $(Get-Location)
+
+ & grunt --gruntfile ../src/umbraco.web.ui.client/gruntfile.js docs
+
+# change baseUrl
+$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
+$IndexPath = "../src/umbraco.web.ui.client/docs/api/index.html"
+(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+# zip it
+
+& $7Zip a -tzip ui-docs.zip $NgDocsSiteOutput -r
+
+#>
+
+################ Do the c# docs
+
+# Build the solution in debug mode
+$SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "umbraco.sln"
+
+# Go get nuget.exe if we don't have it
+$NuGet = "$ToolsRoot\nuget.exe"
+$FileExists = Test-Path $NuGet
+If ($FileExists -eq $False) {
+	Write-Host "Retrieving nuget.exe..."
+	$SourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+	Invoke-WebRequest $SourceNugetExe -OutFile $NuGet
+}
+
+#restore nuget packages
+Write-Host "Restoring nuget packages..."
+& $NuGet restore $SolutionPath
+
+& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount /t:Clean
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+
+# Go get docfx if we don't have it
+$FileExists = Test-Path $DocFx 
+If ($FileExists -eq $False) {
+
+	If(!(Test-Path $DocFxFolder))
+	{
+		New-Item $DocFxFolder -type directory
+	}	
+	
+	Write-Host "Getting docfx..."
+	$DocFxZip = Join-Path -Path $ToolsRoot "docfx\docfx.zip"
+	$DocFxSource = "https://github.com/dotnet/docfx/releases/download/v2.41/docfx.zip"
+	# Create SSL/TLS secure channel to access GitHub API endpoint 
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+	Invoke-WebRequest $DocFxSource -OutFile $DocFxZip
+
+	#unzip it	
+	& $7Zip e $DocFxZip "-o$DocFxFolder"
+}
+
+#clear site
+If(Test-Path(Join-Path -Path $RepoRoot "ApiDocs\_site"))
+{
+	Remove-Item $DocFxSiteOutput -recurse
+}
+
+# run it!
+& $DocFx metadata $DocFxJson
+& $DocFx $DocFxJson --serve
+
+# zip it
+
+& $7Zip a -tzip csharp-docs.zip $DocFxSiteOutput -r
\ No newline at end of file

From e139fa671984732ba48ffb4897933467a06c8786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 26 Apr 2019 13:22:00 +0200
Subject: [PATCH 07/56] first version of copyService

---
 .../src/common/services/copy.service.js       | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/services/copy.service.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
new file mode 100644
index 0000000000..36b49ed423
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -0,0 +1,139 @@
+function copyService(notificationsService, eventsService) {
+    
+    
+    var STORAGE_KEY = "uCopyService";
+    
+    var supportsLocalStorage = function () {
+        var test = "test";
+        
+        try {
+            window.localStorage.setItem(test, test);
+            window.localStorage.removeItem(test);
+            return true;
+        } catch (e) {
+            return false;
+        }
+        
+        return false;
+    }
+    
+    var retriveStorage = function() {
+        if (supportsLocalStorage === false) {
+            return null;
+        }
+        var dataString = window.localStorage.getItem(STORAGE_KEY);
+        if (dataString == null) {
+            return null;
+        }
+        return JSON.parse(dataString);
+    }
+    
+    var saveStorage = function(storage) {
+        var storageString = JSON.stringify(storage)
+        
+        try {
+            var storageJSON = JSON.parse(storageString);
+            window.localStorage.setItem(STORAGE_KEY, storageString);
+            
+            eventsService.emit("copyService.storageUpdate");
+            
+            return true;
+        } catch(e) {
+            return false;
+        }
+        
+        return false;
+    }
+    
+    
+    var service = {};
+    
+    /**
+    * @ngdoc method
+    * @name umbraco.services.copyService#copy
+    * @methodOf umbraco.services.copyService
+    *
+    * @description
+    * Saves a JS-object to the LocalStage of copied items.
+    *
+    */
+    service.copy = function(nodeType, data) {
+        
+        var storage = retriveStorage();
+        if(storage === null) {
+            storage = new Object();
+        }
+        
+        
+        if(nodeType === "content" || nodeType === "element") {
+            if(data.contentTypeAlias === undefined) {
+                // missing contentTypeAlias... then we cant copy jet.
+                success = false;
+            }
+        }
+        
+        /**
+        Will need to store things differently...
+        
+        Can we copy real IpublishedContent...
+        
+        And should I wrap data into a entry-object knowing about the data type..
+        
+        */
+        
+        delete data.key;
+        delete data.$$hashKey;
+        
+        if(storage.items === undefined) {
+            storage.items = [];
+        }
+        
+        storage.items.push({nodeType:nodeType, data:data});
+        
+        if (saveStorage(storage) === true) {
+            notificationsService.success("", "Copied to clipboard.");
+        } else {
+            notificationsService.success("", "Couldnt copy this data to clipboard.");
+        }
+        
+    };
+    
+    service.supportsCopy = supportsLocalStorage;
+    
+    service.hasDataOfType = function(nodeType, nodeTypeAliases) {
+        
+        if(service.retriveDataOfType(nodeType, nodeTypeAliases).length > 0) {
+            return true;
+        }
+        
+        return false;
+    };
+    
+    service.retriveDataOfType = function(nodeType, nodeTypeAliases) {
+        
+        var storage = retriveStorage();
+        
+        if (storage === null) {
+            return [];
+        }
+        
+        var itemsOfType = storage.items.filter(
+            (item) => item.nodeType === nodeType
+        );
+        if (nodeTypeAliases) {
+            return itemsOfType.filter(
+                (item) => {
+                    return nodeTypeAliases.filter(alias => alias === item.data.contentTypeAlias).length > 0;
+                }
+            );
+        } else {
+            return itemsOfType;
+        }
+        
+    };
+    
+    
+    
+    return service;
+}


+angular.module("umbraco.services").factory("copyService", copyService);


From 4d3154c7fa39467b7b180f647c8da887387ef12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 26 Apr 2019 13:34:38 +0200
Subject: [PATCH 08/56] prototype, not working correctly.

---
 .../components/umbnestedcontent.directive.js  |  10 +-
 .../nestedcontent/nestedcontent.controller.js | 170 +++++++++++-------
 .../nestedcontent/nestedcontent.html          |   6 +
 3 files changed, 118 insertions(+), 68 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
index 366294630b..3fe32a0684 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
@@ -12,10 +12,10 @@
             $scope.nodeContext = $scope.model;
 
             // Find the selected tab
-            var selectedTab = $scope.model.tabs[0];
+            var selectedTab = $scope.model.variants[0].tabs[0];
 
             if ($scope.tabAlias) {
-                angular.forEach($scope.model.tabs, function (tab) {
+                angular.forEach($scope.model.variants[0].tabs, function (tab) {
                     if (tab.alias.toLowerCase() === $scope.tabAlias.toLowerCase()) {
                         selectedTab = tab;
                         return;
@@ -32,8 +32,10 @@
                     // Tell inner controls we are submitting
                     $scope.$broadcast("formSubmitting", { scope: $scope });
 
+                    console.log("Form Submitting:: ", $scope.ngModel);
+                    
                     // Sync the values back
-                    angular.forEach($scope.ngModel.tabs, function (tab) {
+                    angular.forEach($scope.ngModel.variants[0].tabs, function (tab) {
                         if (tab.alias.toLowerCase() === selectedTab.alias.toLowerCase()) {
 
                             var localPropsMap = selectedTab.properties.reduce(function (map, obj) {
@@ -94,4 +96,4 @@
 //        },
 //        link: link
 //    }
-//});
\ No newline at end of file
+//});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index a78abf2466..13fc999ac9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -30,10 +30,10 @@
 
         ncResources.getContentTypes().then(function (docTypes) {
             $scope.model.docTypes = docTypes;
-
+            
             // Populate document type tab dictionary
             docTypes.forEach(function (value) {
-                $scope.docTypeTabs[value.alias] = value.tabs;
+                $scope.docTypeTabs[value.alias] = value.variants[0].tabs;
             });
         });
 
@@ -46,7 +46,6 @@
                     return docType.alias === c.ncAlias;
                 });
             });
-
         }
 
         if (!$scope.model.value) {
@@ -65,10 +64,17 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
     "contentResource",
     "localizationService",
     "iconHelper",
-
-    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper) {
+    "copyService",
+    "eventsService",
+    
+    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, copyService, eventsService) {
 
         var inited = false;
+        
+        var contentTypeAliases = [];
+        _.each($scope.model.config.contentTypes, function (contentType) {
+            contentTypeAliases.push(contentType.ncAlias);
+        });
 
         _.each($scope.model.config.contentTypes, function (contentType) {
             contentType.nameExp = !!contentType.nameTemplate
@@ -222,7 +228,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
 
             return name;
         };
-
+        
         $scope.getIcon = function (idx) {
             var scaffold = $scope.getScaffold($scope.model.value[idx].ncContentTypeAlias);
             return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
@@ -269,7 +275,38 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 return contentType.ncAlias === alias;
             });
         }
-
+        
+        $scope.showCopy = copyService.supportsCopy();
+        
+        $scope.showPaste = false;
+        
+        $scope.clickCopy = function($event, node) {
+            copyService.copy("elementType", node);
+            $event.stopPropagation();
+        }
+        
+        $scope.clickPaste = function($event) {
+            
+            var newNode = copyService.retriveDataOfType("elementType", contentTypeAliases).pop();
+            
+            if (newNode === undefined) {
+                return;
+            }
+            
+            console.log(newNode);
+            
+            $scope.nodes.push(newNode);
+            updatemodel();
+            
+            $scope.currentNode = newNode;
+        }
+        
+        function checkAbilityToPasteContent() {
+            $scope.showPaste = copyService.hasDataOfType("elementType", contentTypeAliases);
+        }
+        
+        eventsService.on("copyService.storageUpdate", checkAbilityToPasteContent);
+        
         var notSupported = [
           "Umbraco.Tags",
           "Umbraco.UploadField",
@@ -288,9 +325,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                     var tab = _.find(tabs, function (tab) {
                         return tab.id !== 0 && (tab.alias.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
                     });
-                    scaffold.tabs = [];
+                    scaffold.variants[0].tabs = [];
                     if (tab) {
-                        scaffold.tabs.push(tab);
+                        scaffold.variants[0].tabs.push(tab);
 
                         angular.forEach(tab.properties,
                             function (property) {
@@ -319,7 +356,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             if ($scope.model.config.contentTypes.length === scaffoldsLoaded) {
                 // Because we're loading the scaffolds async one at a time, we need to
                 // sort them explicitly according to the sort order defined by the data type.
-                var contentTypeAliases = [];
+                contentTypeAliases = [];
                 _.each($scope.model.config.contentTypes, function (contentType) {
                     contentTypeAliases.push(contentType.ncAlias);
                 });
@@ -353,64 +390,85 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 }
 
                 inited = true;
+                
+                checkAbilityToPasteContent();
             }
         }
 
         var initNode = function (scaffold, item) {
             var node = angular.copy(scaffold);
-
-            node.key = item && item.key ? item.key : UUID.generate();
-            node.ncContentTypeAlias = scaffold.contentTypeAlias;
-
-            for (var t = 0; t < node.tabs.length; t++) {
-                var tab = node.tabs[t];
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-                    prop.propertyAlias = prop.alias;
-                    prop.alias = $scope.model.alias + "___" + prop.alias;
-                    // Force validation to occur server side as this is the
-                    // only way we can have consistency between mandatory and
-                    // regex validation messages. Not ideal, but it works.
-                    prop.validation = {
-                        mandatory: false,
-                        pattern: ""
-                    };
-                    if (item) {
-                        if (item[prop.propertyAlias]) {
+            
+            node.key = item && item.key ? item.key : String.CreateGuid();
+            //node.ncContentTypeAlias = scaffold.contentTypeAlias;
+            
+            for (var v = 0; v < node.variants.length; v++) {
+                var variant = node.variants[v];
+                
+                console.log("- variant:", variant);
+                
+                for (var t = 0; t < variant.tabs.length; t++) {
+                    var tab = variant.tabs[t];
+                    
+                    console.log("-- tab:", tab);
+                    
+                    for (var p = 0; p < tab.properties.length; p++) {
+                        var prop = tab.properties[p];
+                        
+                        console.log("--- prop:", prop.alias, prop.value);
+                        
+                        prop.propertyAlias = prop.alias;
+                        prop.alias = $scope.model.alias + "___" + prop.alias;
+                        // Force validation to occur server side as this is the
+                        // only way we can have consistency between mandatory and
+                        // regex validation messages. Not ideal, but it works.
+                        prop.validation = {
+                            mandatory: false,
+                            pattern: ""
+                        };
+                        
+                        if (item && item[prop.propertyAlias]) {
+                            
+                            console.log("setting property: ", prop.propertyAlias, item[prop.propertyAlias]);
                             prop.value = item[prop.propertyAlias];
                         }
                     }
                 }
             }
-
+            
+            console.log("initNode node:", node);
+            
             $scope.nodes.push(node);
 
             return node;
         }
+        
+        function convertNodeIntoNCEntry(node) {
+            var obj = {
+                key: node.key,
+                name: node.name,
+                ncContentTypeAlias: node.contentTypeAlias
+            };
+            for (var t = 0; t < node.variants[0].tabs.length; t++) {
+                var tab = node.variants[0].tabs[t];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
+                    if (typeof prop.value !== "function") {
+                        obj[prop.propertyAlias] = prop.value;
+                    }
+                }
+            }
+            console.log(obj);
+            return obj;
+        }
 
-        var updateModel = function () {
+        function updateModel() {
             if ($scope.realCurrentNode) {
                 $scope.$broadcast("ncSyncVal", { key: $scope.realCurrentNode.key });
             }
             if (inited) {
                 var newValues = [];
                 for (var i = 0; i < $scope.nodes.length; i++) {
-                    var node = $scope.nodes[i];
-                    var newValue = {
-                        key: node.key,
-                        name: node.name,
-                        ncContentTypeAlias: node.ncContentTypeAlias
-                    };
-                    for (var t = 0; t < node.tabs.length; t++) {
-                        var tab = node.tabs[t];
-                        for (var p = 0; p < tab.properties.length; p++) {
-                            var prop = tab.properties[p];
-                            if (typeof prop.value !== "function") {
-                                newValue[prop.propertyAlias] = prop.value;
-                            }
-                        }
-                    }
-                    newValues.push(newValue);
+                    newValues.push(convertNodeIntoNCEntry($scope.nodes[i]));
                 }
                 $scope.model.value = newValues;
             }
@@ -428,23 +486,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.$on("$destroy", function () {
             unsubscribe();
         });
-
-        // TODO: Move this into a shared location?
-        var UUID = (function () {
-            var self = {};
-            var lut = []; for (var i = 0; i < 256; i++) { lut[i] = (i < 16 ? "0" : "") + (i).toString(16); }
-            self.generate = function () {
-                var d0 = Math.random() * 0xffffffff | 0;
-                var d1 = Math.random() * 0xffffffff | 0;
-                var d2 = Math.random() * 0xffffffff | 0;
-                var d3 = Math.random() * 0xffffffff | 0;
-                return lut[d0 & 0xff] + lut[d0 >> 8 & 0xff] + lut[d0 >> 16 & 0xff] + lut[d0 >> 24 & 0xff] + "-" +
-                  lut[d1 & 0xff] + lut[d1 >> 8 & 0xff] + "-" + lut[d1 >> 16 & 0x0f | 0x40] + lut[d1 >> 24 & 0xff] + "-" +
-                  lut[d2 & 0x3f | 0x80] + lut[d2 >> 8 & 0xff] + "-" + lut[d2 >> 16 & 0xff] + lut[d2 >> 24 & 0xff] +
-                  lut[d3 & 0xff] + lut[d3 >> 8 & 0xff] + lut[d3 >> 16 & 0xff] + lut[d3 >> 24 & 0xff];
-            }
-            return self;
-        })();
+        
     }
 
 ]);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index bca767f650..f257f6dff0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -21,6 +21,9 @@
                         <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
                             <i class="icon icon-trash"></i>
                         </a>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{copyIconTitle}}" ng-click="clickCopy($event, node);" ng-if="showCopy" prevent-default>
+                            <i class="icon icon-documents"></i>
+                        </a>
                     </div>
 
                 </div>
@@ -40,6 +43,9 @@
             <a href class="umb-nested-content__icon" ng-class="{ 'umb-nested-content__icon--disabled': !scaffolds.length }" ng-click="openNodeTypePicker($event)" prevent-default>
                 <i class="icon icon-add"></i>
             </a>
+            <a class="umb-nested-content__icon" ng-click="clickPaste($event)" title="Paste" ng-if="showPaste" prevent-default>
+                <i class="icon icon-paste-in"></i>
+            </a>
         </div>
 
     </ng-form>

From 48ceb0d41dbacca797fe78b1e8d2e5c845a0bd08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 26 Apr 2019 15:15:27 +0200
Subject: [PATCH 09/56] working prototype

---
 .../components/umbnestedcontent.directive.js  |  4 +-
 .../src/common/services/copy.service.js       | 51 ++++++++-----------
 .../nestedcontent/nestedcontent.controller.js | 48 ++++++++---------
 3 files changed, 43 insertions(+), 60 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
index 3fe32a0684..471714d30b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
@@ -3,7 +3,7 @@
     function () {
 
         var link = function ($scope) {
-
+            
             // Clone the model because some property editors
             // do weird things like updating and config values
             // so we want to ensure we start from a fresh every
@@ -31,8 +31,6 @@
 
                     // Tell inner controls we are submitting
                     $scope.$broadcast("formSubmitting", { scope: $scope });
-
-                    console.log("Form Submitting:: ", $scope.ngModel);
                     
                     // Sync the values back
                     angular.forEach($scope.ngModel.variants[0].tabs, function (tab) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index 36b49ed423..32f23d2525 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -64,52 +64,38 @@ function copyService(notificationsService, eventsService) {
             storage = new Object();
         }
         
-        
-        if(nodeType === "content" || nodeType === "element") {
-            if(data.contentTypeAlias === undefined) {
-                // missing contentTypeAlias... then we cant copy jet.
-                success = false;
-            }
-        }
-        
-        /**
-        Will need to store things differently...
-        
-        Can we copy real IpublishedContent...
-        
-        And should I wrap data into a entry-object knowing about the data type..
-        
-        */
-        
-        delete data.key;
-        delete data.$$hashKey;
-        
         if(storage.items === undefined) {
             storage.items = [];
         }
         
-        storage.items.push({nodeType:nodeType, data:data});
+        var shallowCloneData = Object.assign({}, data);// Notice only a shallow copy, since we dont need to deep copy. (that will happen when storing the data)
+        
+        delete shallowCloneData.key;
+        delete shallowCloneData.$$hashKey;
+        
+        var entry = {nodeType:nodeType, data:shallowCloneData};
+        storage.items.push(entry);
         
         if (saveStorage(storage) === true) {
-            notificationsService.success("", "Copied to clipboard.");
+            notificationsService.success("Clipboard", "Copied to clipboard.");
         } else {
-            notificationsService.success("", "Couldnt copy this data to clipboard.");
+            notificationsService.success("Clipboard", "Couldnt copy this data to clipboard.");
         }
         
     };
     
     service.supportsCopy = supportsLocalStorage;
     
-    service.hasDataOfType = function(nodeType, nodeTypeAliases) {
+    service.hasEntriesOfType = function(nodeType, nodeTypeAliases) {
         
-        if(service.retriveDataOfType(nodeType, nodeTypeAliases).length > 0) {
+        if(service.retriveEntriesOfType(nodeType, nodeTypeAliases).length > 0) {
             return true;
         }
         
         return false;
     };
     
-    service.retriveDataOfType = function(nodeType, nodeTypeAliases) {
+    service.retriveEntriesOfType = function(nodeType, nodeTypeAliases) {
         
         var storage = retriveStorage();
         
@@ -117,19 +103,22 @@ function copyService(notificationsService, eventsService) {
             return [];
         }
         
-        var itemsOfType = storage.items.filter(
+        var filteretEntries = storage.items.filter(
             (item) => item.nodeType === nodeType
         );
         if (nodeTypeAliases) {
-            return itemsOfType.filter(
+            filteretEntries = filteretEntries.filter(
                 (item) => {
                     return nodeTypeAliases.filter(alias => alias === item.data.contentTypeAlias).length > 0;
                 }
             );
-        } else {
-            return itemsOfType;
         }
-        
+        return filteretEntries;
+    };
+    
+    
+    service.retriveDataOfType = function(nodeType, nodeTypeAliases) {
+        return service.retriveEntriesOfType(nodeType, nodeTypeAliases).map((x) => x.data);
     };
     
     
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 13fc999ac9..cf4ee0dd3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -113,7 +113,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.addNode = function (alias) {
             var scaffold = $scope.getScaffold(alias);
 
-            var newNode = initNode(scaffold, null);
+            var newNode = createNode(scaffold, null);
 
             $scope.currentNode = newNode;
             $scope.setDirty();
@@ -224,8 +224,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             if ($scope.nodes[idx].name !== name) {
                 $scope.nodes[idx].name = name;
             }
-
-
+            
             return name;
         };
         
@@ -281,6 +280,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.showPaste = false;
         
         $scope.clickCopy = function($event, node) {
+            
+            syncCurrentNode();
+            
             copyService.copy("elementType", node);
             $event.stopPropagation();
         }
@@ -293,16 +295,17 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 return;
             }
             
-            console.log(newNode);
+            // generate a new key.
+            newNode.key = String.CreateGuid();
             
             $scope.nodes.push(newNode);
-            updatemodel();
+            //updateModel();// done by setting current node...
             
             $scope.currentNode = newNode;
         }
         
         function checkAbilityToPasteContent() {
-            $scope.showPaste = copyService.hasDataOfType("elementType", contentTypeAliases);
+            $scope.showPaste = copyService.hasEntriesOfType("elementType", contentTypeAliases);
         }
         
         eventsService.on("copyService.storageUpdate", checkAbilityToPasteContent);
@@ -373,7 +376,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                             // No such scaffold - the content type might have been deleted. We need to skip it.
                             continue;
                         }
-                        initNode(scaffold, item);
+                        createNode(scaffold, item);
                     }
                 }
 
@@ -394,28 +397,21 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 checkAbilityToPasteContent();
             }
         }
-
-        var initNode = function (scaffold, item) {
+        
+        function createNode(scaffold, fromNcEntry) {
             var node = angular.copy(scaffold);
             
-            node.key = item && item.key ? item.key : String.CreateGuid();
-            //node.ncContentTypeAlias = scaffold.contentTypeAlias;
+            node.key = fromNcEntry && fromNcEntry.key ? fromNcEntry.key : String.CreateGuid();
             
             for (var v = 0; v < node.variants.length; v++) {
                 var variant = node.variants[v];
                 
-                console.log("- variant:", variant);
-                
                 for (var t = 0; t < variant.tabs.length; t++) {
                     var tab = variant.tabs[t];
                     
-                    console.log("-- tab:", tab);
-                    
                     for (var p = 0; p < tab.properties.length; p++) {
                         var prop = tab.properties[p];
                         
-                        console.log("--- prop:", prop.alias, prop.value);
-                        
                         prop.propertyAlias = prop.alias;
                         prop.alias = $scope.model.alias + "___" + prop.alias;
                         // Force validation to occur server side as this is the
@@ -426,17 +422,13 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                             pattern: ""
                         };
                         
-                        if (item && item[prop.propertyAlias]) {
-                            
-                            console.log("setting property: ", prop.propertyAlias, item[prop.propertyAlias]);
-                            prop.value = item[prop.propertyAlias];
+                        if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
+                            prop.value = fromNcEntry[prop.propertyAlias];
                         }
                     }
                 }
             }
             
-            console.log("initNode node:", node);
-            
             $scope.nodes.push(node);
 
             return node;
@@ -457,14 +449,18 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                     }
                 }
             }
-            console.log(obj);
             return obj;
         }
-
-        function updateModel() {
+        
+        function syncCurrentNode() {
             if ($scope.realCurrentNode) {
                 $scope.$broadcast("ncSyncVal", { key: $scope.realCurrentNode.key });
             }
+        }
+        
+        function updateModel() {
+            syncCurrentNode();
+            
             if (inited) {
                 var newValues = [];
                 for (var i = 0; i < $scope.nodes.length; i++) {

From 7e064cee83fdb82bc740531c2dcca72399892b2a Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Sun, 28 Apr 2019 21:14:32 +0200
Subject: [PATCH 10/56] Optimizing scripts

---
 build/build-docs.ps1 | 121 ++++++++-----------------------------------
 1 file changed, 23 insertions(+), 98 deletions(-)

diff --git a/build/build-docs.ps1 b/build/build-docs.ps1
index c1b2b22f03..15a150ce25 100644
--- a/build/build-docs.ps1
+++ b/build/build-docs.ps1
@@ -1,119 +1,44 @@
-$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path);
-$RepoRoot = (get-item $PSScriptFilePath).Directory.Parent.FullName;
-$SolutionRoot = Join-Path -Path $RepoRoot "src";
-$ToolsRoot = Join-Path -Path $RepoRoot "\build\temp";
-$DocFx = Join-Path -Path $ToolsRoot "docfx\docfx.exe"
-$DocFxFolder = (Join-Path -Path $ToolsRoot "docfx")
-$DocFxJson = Join-Path -Path $SolutionRoot "ApiDocs\docfx.json"
-$7Zip = Join-Path -Path $ToolsRoot "7za.exe"
-$DocFxSiteOutput = Join-Path -Path $SolutionRoot "ApiDocs\_site\*.*"
-#$NgDocsSiteOutput = Join-Path -Path $RepoRoot "src\Umbraco.Web.UI.Client\docs\api\*.*"
-$ProgFiles86 = [Environment]::GetEnvironmentVariable("ProgramFiles(x86)");
-$MSBuild = "$ProgFiles86\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
+$uenv=build/build.ps1 -get
+
+$src = "$($uenv.SolutionRoot)\src"
+$tmp = $uenv.BuildTemp
+$out = $uenv.BuildOutput
+$DocFxJson = "$src\ApiDocs\docfx.json"
+$DocFxSiteOutput = "$tmp\_site\*.*"
 
-<#
 ################ Do the UI docs
+$uenv.CompileBelle()
 
-"Changing to Umbraco.Web.UI.Client folder"
-cd ..
-cd src\Umbraco.Web.UI.Client
-Write-Host $(Get-Location)
+"Moving to Umbraco.Web.UI.Client folder"
+cd .\src\Umbraco.Web.UI.Client
 
-"Creating build folder so MSBuild doesn't run the whole grunt build"
-if (-Not (Test-Path "build")) {
-    md "build"
-}
-
-"Installing node"
-# Check if Install-Product exists, should only exist on the build server
-if (Get-Command Install-Product -errorAction SilentlyContinue)
-{
-    Install-Product node ''
-}
-
-"Installing node modules"
-& npm install
-
-"Installing grunt"
-& npm install -g grunt-cli
-
-"Moving back to build folder"
-cd ..
-cd ..
-cd build
-Write-Host $(Get-Location)
-
- & grunt --gruntfile ../src/umbraco.web.ui.client/gruntfile.js docs
+"Generating the docs and waiting before executing the next commands"
+& gulp docs | Out-Null
 
 # change baseUrl
 $BaseUrl = "https://our.umbraco.org/apidocs/ui/"
-$IndexPath = "../src/umbraco.web.ui.client/docs/api/index.html"
+$IndexPath = "./docs/api/index.html"
 (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+
 # zip it
+& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
 
-& $7Zip a -tzip ui-docs.zip $NgDocsSiteOutput -r
-
-#>
 
 ################ Do the c# docs
 
 # Build the solution in debug mode
-$SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "umbraco.sln"
-
-# Go get nuget.exe if we don't have it
-$NuGet = "$ToolsRoot\nuget.exe"
-$FileExists = Test-Path $NuGet
-If ($FileExists -eq $False) {
-	Write-Host "Retrieving nuget.exe..."
-	$SourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-	Invoke-WebRequest $SourceNugetExe -OutFile $NuGet
-}
+$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
+#$uenv.CompileUmbraco()
 
 #restore nuget packages
-Write-Host "Restoring nuget packages..."
-& $NuGet restore $SolutionPath
+$uenv.RestoreNuGet()
 
-& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount /t:Clean
-if (-not $?)
-{
-	throw "The MSBuild process returned an error code."
-}
-& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount
-if (-not $?)
-{
-	throw "The MSBuild process returned an error code."
-}
+# run DocFx
+$DocFx = $uenv.BuildEnv.DocFx
 
-# Go get docfx if we don't have it
-$FileExists = Test-Path $DocFx 
-If ($FileExists -eq $False) {
-
-	If(!(Test-Path $DocFxFolder))
-	{
-		New-Item $DocFxFolder -type directory
-	}	
-	
-	Write-Host "Getting docfx..."
-	$DocFxZip = Join-Path -Path $ToolsRoot "docfx\docfx.zip"
-	$DocFxSource = "https://github.com/dotnet/docfx/releases/download/v2.41/docfx.zip"
-	# Create SSL/TLS secure channel to access GitHub API endpoint 
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-	Invoke-WebRequest $DocFxSource -OutFile $DocFxZip
-
-	#unzip it	
-	& $7Zip e $DocFxZip "-o$DocFxFolder"
-}
-
-#clear site
-If(Test-Path(Join-Path -Path $RepoRoot "ApiDocs\_site"))
-{
-	Remove-Item $DocFxSiteOutput -recurse
-}
-
-# run it!
+Write-Host "$DocFxJson"
 & $DocFx metadata $DocFxJson
-& $DocFx $DocFxJson --serve
+& $DocFx build $DocFxJson
 
 # zip it
-
-& $7Zip a -tzip csharp-docs.zip $DocFxSiteOutput -r
\ No newline at end of file
+& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput

From 880e86820ef216150b3a10360adf2ae430c7c32b Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Sun, 28 Apr 2019 21:15:59 +0200
Subject: [PATCH 11/56] Updating with correct directory refferences

---
 src/ApiDocs/docfx.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 0d0efe4f66..21f310fec6 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -11,7 +11,7 @@
           "exclude": [
             "**/obj/**",
             "**/bin/**",
-            "_site/**"
+            "../../build.tmp/_site/**"
           ]
         }
       ],
@@ -36,7 +36,7 @@
         ],
         "exclude": [
           "obj/**",
-          "_site/**"
+          "../../build.tmp/_site/**"
         ]
       }
     ],
@@ -47,7 +47,7 @@
         ],
         "exclude": [
           "obj/**",
-          "_site/**"
+          "../../build.tmp/_site/**"
         ]
       }
     ],
@@ -58,7 +58,7 @@
         ],
         "exclude": [
           "obj/**",
-          "_site/**"
+          "../../build.tmp/_site/**"
         ]
       }
     ],
@@ -67,7 +67,7 @@
       "_enableSearch": true,
       "_disableContribution": false
     },
-    "dest": "_site",
+    "dest": "../../build.tmp/_site",
     "template": [
       "default", "umbracotemplate"
     ]

From 01116e21f44bccf994fcd25ab0e044c4332282cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 12:48:44 +0200
Subject: [PATCH 12/56] finished copy service

---
 .../src/common/services/copy.service.js       | 77 ++++++++++++-------
 .../nestedcontent/nestedcontent.controller.js | 27 ++++++-
 2 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index 32f23d2525..abfd6e71e6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -21,11 +21,23 @@ function copyService(notificationsService, eventsService) {
         if (supportsLocalStorage === false) {
             return null;
         }
+        
+        
+        var dataJSON;
         var dataString = window.localStorage.getItem(STORAGE_KEY);
-        if (dataString == null) {
-            return null;
+        if (dataString != null) {
+            dataJSON = JSON.parse(dataString);
         }
-        return JSON.parse(dataString);
+        
+        if(dataJSON == null) {
+            dataJSON = new Object();
+        }
+        
+        if(dataJSON.entries === undefined) {
+            dataJSON.entries = [];
+        }
+        
+        return dataJSON;
     }
     
     var saveStorage = function(storage) {
@@ -54,27 +66,28 @@ function copyService(notificationsService, eventsService) {
     * @methodOf umbraco.services.copyService
     *
     * @description
-    * Saves a JS-object to the LocalStage of copied items.
+    * Saves a JS-object to the LocalStage of copied entries.
     *
     */
     service.copy = function(nodeType, data) {
         
         var storage = retriveStorage();
-        if(storage === null) {
-            storage = new Object();
-        }
-        
-        if(storage.items === undefined) {
-            storage.items = [];
-        }
         
         var shallowCloneData = Object.assign({}, data);// Notice only a shallow copy, since we dont need to deep copy. (that will happen when storing the data)
-        
         delete shallowCloneData.key;
         delete shallowCloneData.$$hashKey;
         
-        var entry = {nodeType:nodeType, data:shallowCloneData};
-        storage.items.push(entry);
+        var key = data.key || data.$$hashKey || console.error("missing unique key for this content");
+        
+        // remove previous copies of this entry:
+        storage.entries = storage.entries.filter(
+            (entry) => {
+                return entry.unique !== key;
+            }
+        );
+        
+        var entry = {unique:key, nodeType:nodeType, data:shallowCloneData};
+        storage.entries.push(entry);
         
         if (saveStorage(storage) === true) {
             notificationsService.success("Clipboard", "Copied to clipboard.");
@@ -99,28 +112,36 @@ function copyService(notificationsService, eventsService) {
         
         var storage = retriveStorage();
         
-        if (storage === null) {
-            return [];
-        }
-        
-        var filteretEntries = storage.items.filter(
-            (item) => item.nodeType === nodeType
+        // Find entries that are furfilling the criterias for this nodeTYpe and nodeTypesAliases.
+        var filteretEntries = storage.entries.filter(
+            (entry) => {
+                return (entry.nodeType === nodeType && nodeTypeAliases.filter(alias => alias === entry.data.contentTypeAlias).length > 0);
+            }
         );
-        if (nodeTypeAliases) {
-            filteretEntries = filteretEntries.filter(
-                (item) => {
-                    return nodeTypeAliases.filter(alias => alias === item.data.contentTypeAlias).length > 0;
-                }
-            );
-        }
+        
         return filteretEntries;
     };
     
-    
     service.retriveDataOfType = function(nodeType, nodeTypeAliases) {
         return service.retriveEntriesOfType(nodeType, nodeTypeAliases).map((x) => x.data);
     };
     
+    service.clearEntriesOfType = function(nodeType, nodeTypeAliases) {
+        
+        var storage = retriveStorage();
+        
+        // Find entries that are NOT furfilling the criterias for this nodeTYpe and nodeTypesAliases.
+        var filteretEntries = storage.entries.filter(
+            (entry) => {
+                return !(entry.nodeType === nodeType && nodeTypeAliases.filter(alias => alias === entry.data.contentTypeAlias).length > 0);
+            }
+        );
+        
+        storage.entries = filteretEntries;
+        
+        saveStorage(storage);
+    };
+    
     
     
     return service;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index cf4ee0dd3e..b47cd4566a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -158,13 +158,29 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             if ($scope.overlayMenu.availableItems.length === 0) {
                 return;
             }
-
-            if ($scope.overlayMenu.availableItems.length === 1) {
+            
+            $scope.overlayMenu.pasteItems = [];
+            var availableNodesForPaste = copyService.retriveDataOfType("elementType", contentTypeAliases);
+            _.each(availableNodesForPaste, function (node) {
+                $scope.overlayMenu.pasteItems.push({
+                    alias: node.contentTypeAlias,
+                    name: node.name, //contentTypeName
+                    icon: iconHelper.convertFromLegacyIcon(node.icon)
+                });
+            });
+            $scope.overlayMenu.clickClearPaste = function($event) {
+                $event.stopPropagation();
+                $event.preventDefault();
+                copyService.clearEntriesOfType("elementType", contentTypeAliases);
+                $scope.overlayMenu.pasteItems = [];// This dialog is not connected via the copyService events, so we need to update manually.
+            };
+            
+            if ($scope.overlayMenu.availableItems.length === 1 && $scope.overlayMenu.pasteItems.length === 0) {
                 // only one scaffold type - no need to display the picker
                 $scope.addNode($scope.scaffolds[0].contentTypeAlias);
                 return;
             }
-
+            
             $scope.overlayMenu.show = true;
         };
 
@@ -290,6 +306,11 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.clickPaste = function($event) {
             
             var newNode = copyService.retriveDataOfType("elementType", contentTypeAliases).pop();
+            $scope.pasteFromClipboard(newNode);
+            
+        }
+        
+        $scope.pasteFromClipboard = function(newNode) {
             
             if (newNode === undefined) {
                 return;

From 90912a4b2abfe7ceda5fac874e2e51013d8d1078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 12:49:37 +0200
Subject: [PATCH 13/56] restyled umb-overlay + added paste features in
 nested-content create-overlay

---
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../src/less/components/card.less             | 53 ++++++++-----
 .../src/less/components/overlays.less         | 79 ++++++++++---------
 .../components/overlays/umb-itempicker.less   |  3 +
 .../itempicker/itempicker.html                |  8 +-
 .../macropicker/macropicker.html              |  6 +-
 .../overlays/itempicker/itempicker.html       | 32 +++++++-
 .../mediatypepicker/mediatypepicker.html      |  6 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  4 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  4 +-
 .../Umbraco/config/lang/en_us.xml             |  4 +-
 11 files changed, 129 insertions(+), 71 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less

diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 4c86f3289b..fed890cab6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -129,6 +129,7 @@
 @import "components/tooltip/umb-tooltip.less";
 @import "components/tooltip/umb-tooltip-list.less";
 @import "components/overlays/umb-overlay-backdrop.less";
+@import "components/overlays/umb-itempicker.less";
 @import "components/umb-grid.less";
 @import "components/umb-empty-state.less";
 @import "components/umb-property-editor.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index 0f4f2a7a9d..c6a9212b3e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -6,6 +6,7 @@
 	position: relative;
 	padding: 5px 10px 5px 10px;
     background: white;
+    width: 100%;
 
     .title{padding: 12px; color: @gray-3; border-bottom: 1px solid @gray-8; font-weight: 400; font-size: 16px; text-transform: none; margin: 0 -10px 10px -10px;}
 
@@ -84,20 +85,20 @@
 	padding: 0;
 	margin: 0 auto;
 	list-style: none;
-
+    width: 100%;
+    
 	display: flex;
 	flex-flow: row wrap;
 	justify-content: flex-start;
 }
 
 .umb-card-grid li {
-	padding: 5px;
 	overflow: hidden;
 	font-size: 12px;
 	text-align: center;
-	width: 100px;
 	box-sizing: border-box;
 	position: relative;
+    width: 100px;
 }
 
 .umb-card-grid li.-four-in-row {
@@ -111,36 +112,46 @@
 }
 
 .umb-card-grid .umb-card-grid-item {
+    position: relative;
 	display: block;
 	width: 100%;
-	height: 100%;
+	//height: 100%;
+    padding-top: 100%;
 	border-radius: 3px;
-    padding-bottom: 5px;
+    transition: background-color 120ms;
+    
+    > span {
+        position: absolute;
+        top: 10px;
+        bottom: 10px;
+        left: 10px;
+        right: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        background-color: transparent;
+    }
 }
 
 
- .umb-card-grid .umb-card-grid-item:hover,
- .umb-card-grid .umb-card-grid-item:focus,
- .umb-card-grid .umb-card-grid-item:hover > *,
- .umb-card-grid .umb-card-grid-item:focus > *  {
-	background: @ui-option-hover;
+.umb-card-grid .umb-card-grid-item:hover,
+.umb-card-grid .umb-card-grid-item:focus {
+	background-color: @ui-option-hover;
 	color: @ui-option-type-hover;
-	cursor: pointer;
-	outline: none;
-	border-radius: 3px;
 }
 
 .umb-card-grid a {
-     color: @ui-option-type;
-     text-decoration: none;
- }
+    color: @ui-option-type;
+    text-decoration: none;
+}
 
 .umb-card-grid i {
-     font-size: 30px;
-     line-height: 50px;
-     display: block;
-	  color: @ui-option-type;
- }
+    font-size: 30px;
+    line-height: 20px;
+    margin-bottom: 10px;
+    display: block;
+}
 
  .umb-card-grid .umb-card-grid-item__loading {
 	 position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 9205dc9c5f..a089463a2d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -5,13 +5,13 @@
     z-index: @zindexUmbOverlay;
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 50px rgba(0,0,0,0.1), 0 6px 20px rgba(0,0,0,0.16);
+    text-align: left;
 }
 
 .umb-overlay__form {
     display: flex;
     flex-wrap: nowrap;
     flex-direction: column;
-    height: 100%;
 }
 
 .umb-overlay .umb-overlay-header {
@@ -19,37 +19,61 @@
     border-bottom: 1px solid @purple-l3;
     //background: @blueExtraDark;
     //color:@u-white;
-    padding: 10px;
     margin-top: 0;
     flex-grow: 0;
     flex-shrink: 0;
+    
+    padding: 20px 30px 0;
 }
 
 
-.umb-overlay .umb-overlay__title {
+
+.umb-overlay__section-header {
+    width: 100%;
+    margin-top:30px;
+    margin-bottom: 10px;
+    
+    h5 {
+        display: inline;
+    }
+    
+    button {
+        display: inline;
+        float: right;
+        background-color: transparent;
+        border:none;
+        &:hover {
+            color: @ui-option-type-hover;
+        }
+    }
+}
+
+.umb-overlay__title {
     font-size: @fontSizeLarge;
     color: @black;
     font-weight: bold;
     margin: 7px 0;
 }
 
-.umb-overlay .umb-overlay__subtitle {
+.umb-overlay__subtitle {
     font-size: @fontSizeSmall;
     color: @gray-3;
     margin: 0;
 }
 
-.umb-overlay .umb-overlay-container {
+.umb-overlay-container {
     flex-grow: 1;
     flex-shrink: 1;
     flex-basis: auto;
-    overflow-y: auto;
-    overflow-x: hidden;
     position: relative;
-    height: auto;
+    
+    padding: 0px 30px;
+    margin-bottom: 10px;
+    max-height: calc(100vh - 170px);
+    overflow-y: auto;
 }
 
-.umb-overlay .umb-overlay-drawer {
+.umb-overlay-drawer {
     flex-grow: 0;
     flex-shrink: 0;
     flex-basis: 31px;
@@ -60,16 +84,16 @@
     border-top: 1px solid @purple-l3;
 }
 
-.umb-overlay .umb-overlay-drawer.-auto-height {
+.umb-overlay-drawer.-auto-height {
     flex-basis: auto;
 }
 
-.umb-overlay .umb-overlay-drawer .umb-overlay-drawer__align-right {
+.umb-overlay-drawer .umb-overlay-drawer__align-right {
     display: flex;
     justify-content: flex-end;
 }
 
-.umb-overlay .umb-overlay-drawer .umb-overlay-drawer-content .dropdown-menu {
+.umb-overlay-drawer .umb-overlay-drawer-content .dropdown-menu {
     right: 0;
     left: auto;
 }
@@ -89,27 +113,23 @@
 .umb-overlay.umb-overlay-center .umb-overlay-header {
     border: none;
     background: transparent;
-    padding: 20px 20px 0 20px;
+    padding: 30px 30px 0;
 }
 
 .umb-overlay.umb-overlay-center .umb-overlay__form {
-    max-height: 80vh;
-}
-
-.umb-overlay.umb-overlay-center .umb-overlay-container {
-    padding: 20px;
+    
 }
 
 .umb-overlay.umb-overlay-center .umb-overlay-drawer {
     border: none;
     background: transparent;
-    padding: 0 20px 20px 20px;
+    padding: 0 30px 20px;
 }
 
 /* ---------- OVERLAY TARGET ---------- */
 .umb-overlay.umb-overlay-target {
     width: 400px;
-    height: 400px;
+    max-height: 100vh;
     box-sizing: border-box;
     border-radius: @baseBorderRadius;
 }
@@ -117,18 +137,12 @@
 .umb-overlay.umb-overlay-target .umb-overlay-header {
     border: none;
     background: transparent;
-    padding: 20px 20px 0 20px;
-    text-align: center;
-}
-
-.umb-overlay.umb-overlay-target .umb-overlay-container {
-    padding: 20px;
 }
 
 .umb-overlay.umb-overlay-target .umb-overlay-drawer {
     border: none;
     background: transparent;
-    padding: 0 20px 20px 20px;
+    padding: 0 30px 20px;
 }
 
 /* ---------- OVERLAY RIGHT ---------- */
@@ -143,14 +157,9 @@
 
 .umb-overlay.umb-overlay-right .umb-overlay-header {
     flex-basis: 100px;
-    padding: 20px;
     box-sizing: border-box;
 }
 
-.umb-overlay.umb-overlay-right .umb-overlay-container {
-    padding: 20px;
-}
-
 // reset the top position to 0 because we are in a asbolute container and want to 
 // overlay to go all the way to the top
 .umb-editors .umb-overlay.umb-overlay-right {
@@ -175,14 +184,10 @@
 
 .umb-overlay.umb-overlay-left .umb-overlay-header {
     flex-basis: 100px;
-    padding: 20px;
+    padding: 30px 30px 0;
     box-sizing: border-box;
 }
 
-.umb-overlay.umb-overlay-left .umb-overlay-container {
-    padding: 20px;
-}
-
 @media (max-width: 767px) {
     .umb-overlay.umb-overlay-left {
         margin-left: 61px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
new file mode 100644
index 0000000000..010ff4636d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
@@ -0,0 +1,3 @@
+.umb-itempicker .form-search {
+    margin-top:10px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
index 80d4baff6e..aaefd80250 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
@@ -23,14 +23,16 @@
                                 umb-auto-focus
                                 no-dirty-check />
                     </div>
-                    
+
                     <ul class="umb-card-grid">
                         <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
                             ng-click="vm.selectItem(availableItem)"
                             class="-three-in-row">
                             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
-                                <i class="{{ availableItem.icon }}"></i>
-                                {{ availableItem.name }}
+                                <span>
+                                    <i class="{{ availableItem.icon }}"></i>
+                                    {{ availableItem.name }}
+                                </span>
                             </a>
                         </li>
                     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index 1e75a4ba06..53a2858c62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -34,8 +34,10 @@
                                     ng-click="selectMacro(availableItem)"
                                     class="-three-in-row">
                                     <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
-                                        <i class="icon-settings-alt"></i>
-                                        {{ availableItem.name }}
+                                        <span>
+                                            <i class="icon-settings-alt"></i>
+                                            {{ availableItem.name }}
+                                        </span>
                                     </a>
                                 </li>
                             </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 328344ea84..e08cba6063 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Overlays.ItemPickerOverlay">
+<div ng-controller="Umbraco.Overlays.ItemPickerOverlay" class="umb-itempicker">
 
     <div class="form-search" ng-hide="model.filter === false" style="margin-bottom: 15px;">
         <i class="icon-search"></i>
@@ -11,13 +11,39 @@
                no-dirty-check />
     </div>
 
+    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:searchTerm).length > 0">
+        <h5><localize key="content_createFromClipboard">Paste from clipboard</localize></h5>
+        <button ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)">
+            <i class="icon-trash"></i>
+        </button>
+    </div>
+
+    <ul class="umb-card-grid">
+        <li ng-repeat="pasteItem in model.pasteItems | filter:searchTerm"
+            ng-click="pasteItem(pasteItem)"
+            class="-three-in-row">
+            <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
+                <span>
+                    <i class="{{ pasteItem.icon }}"></i>
+                    {{ pasteItem.name }}
+                </span>
+            </a>
+        </li>
+    </ul>
+
+    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:searchTerm).length > 0">
+        <h5><localize key="content_createEmpty">Create new</localize></h5>
+    </div>
+
     <ul class="umb-card-grid">
         <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
             ng-click="selectItem(availableItem)"
             class="-three-in-row">
             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
-                <i class="{{ availableItem.icon }}"></i>
-                {{ availableItem.name }}
+                <span>
+                    <i class="{{ availableItem.icon }}"></i>
+                    {{ availableItem.name }}
+                </span>
             </a>
         </li>
     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
index bd37800717..e7b5dddee1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
@@ -6,8 +6,10 @@
         ng-click="select(mediatype)"
         class="-three-in-row">
         <a class="umb-card-grid-item" href="" title="{{mediatype.name}}">
-            <i class="{{ mediatype.icon }}"></i>
-            {{ mediatype.name }}
+            <span>
+                <i class="{{ mediatype.icon }}"></i>
+                {{ mediatype.name }}
+            </span>
         </a>
       </li>
     </ul>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 7cc7c7823a..d33962e221 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -283,7 +283,9 @@
     <key alias="readyToPublish">Klar til at udgive?</key>
     <key alias="readyToSave">Klar til at gemme?</key>
     <key alias="sendForApproval">Send til godkendelse</key>
-    <key alias="schedulePublishHelp">Vælg dato og klokkeslæt for at udgive og/eller afpublicere indholdet.</key>
+    <key alias="schedulePublishHelp">Vælg dato og klokkeslæt for at udgive og/eller afpublicere indholdet.</key>
+    <key alias="createEmpty">Opret ny</key>
+    <key alias="createFromClipboard">Indsæt fra udklipsmappen</key>
   </area>
   <area alias="blueprints">
     <key alias="createBlueprintFrom">Opret en ny indholdsskabelon fra '%0%'</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 78fe096bd1..416c8901db 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -292,7 +292,9 @@
     <key alias="readyToPublish">Ready to Publish?</key>
     <key alias="readyToSave">Ready to Save?</key>
     <key alias="sendForApproval">Send for approval</key>
-    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
   </area>
   <area alias="blueprints">
     <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 4e13407a4c..3b36a5e596 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -49,7 +49,9 @@
     <key alias="setPermissions">Set permissions</key>
     <key alias="unlock">Unlock</key>
     <key alias="createblueprint">Create Content Template</key>
-    <key alias="resendInvite">Resend Invitation</key>
+    <key alias="resendInvite">Resend Invitation</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
   </area>
   <area alias="actionCategories">
     <key alias="content">Content</key>

From 5d7aa4bcf5812564621098be49543be05c6c7bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 13:34:35 +0200
Subject: [PATCH 14/56] remove edit and paste button.

---
 .../views/propertyeditors/nestedcontent/nestedcontent.html  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index f257f6dff0..4ae1f7df8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -12,9 +12,6 @@
                     <div class="umb-nested-content__heading" ng-class="{'-with-icon': showIcons}"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>
 
                     <div class="umb-nested-content__icons">
-                        <a class="umb-nested-content__icon umb-nested-content__icon--edit" localize="title" title="general_edit" ng-class="{ 'umb-nested-content__icon--active' : $parent.realCurrentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" ng-show="$parent.maxItems > 1" prevent-default>
-                            <i class="icon icon-edit"></i>
-                        </a>
                         <a class="umb-nested-content__icon umb-nested-content__icon--move" localize="title" title="actions_move" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
                             <i class="icon icon-navigation"></i>
                         </a>
@@ -43,9 +40,6 @@
             <a href class="umb-nested-content__icon" ng-class="{ 'umb-nested-content__icon--disabled': !scaffolds.length }" ng-click="openNodeTypePicker($event)" prevent-default>
                 <i class="icon icon-add"></i>
             </a>
-            <a class="umb-nested-content__icon" ng-click="clickPaste($event)" title="Paste" ng-if="showPaste" prevent-default>
-                <i class="icon icon-paste-in"></i>
-            </a>
         </div>
 
     </ng-form>

From 77407a94460bc467b5e2ab3cd113f24dabaaa26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 13:39:17 +0200
Subject: [PATCH 15/56] correcting text

---
 .../src/views/common/overlays/itempicker/itempicker.html        | 2 +-
 .../propertyeditors/nestedcontent/nestedcontent.controller.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index e08cba6063..c7461cdf78 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -13,7 +13,7 @@
 
     <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:searchTerm).length > 0">
         <h5><localize key="content_createFromClipboard">Paste from clipboard</localize></h5>
-        <button ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)">
+        <button ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)" alt="Clear clipboard for entries accepted in this context.">
             <i class="icon-trash"></i>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index b47cd4566a..b97cbadd8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -99,7 +99,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.wideMode = Object.toBoolean($scope.model.config.hideLabel);
 
         $scope.labels = {};
-        localizationService.localizeMany(["grid_insertControl"]).then(function(data) {
+        localizationService.localizeMany(["grid_addElement"]).then(function(data) {
             $scope.labels.docTypePickerTitle = data[0];
         });
 

From 18c7680bafbea9fbee383c16b9953932cd4c38ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 13:53:06 +0200
Subject: [PATCH 16/56] remove unused CSS

---
 .../src/less/components/umb-nested-content.less        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index eec23869b5..78cb9410d3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -223,16 +223,6 @@
     display: none !important;
 }
 
-.umb-nested-content__help-text {
-    display: inline-block;
-    padding: 10px 20px 10px 20px;
-    clear: both;
-    font-size: 14px;
-    color: @gray-3;
-    background: @gray-10;
-    border-radius: 15px;
-}
-
 .umb-nested-content__doctypepicker table input, 
 .umb-nested-content__doctypepicker table select {
     width: 100%;

From 8e925c930b0b581b90b0498e3c7bcbc7df1cf7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 14:05:20 +0200
Subject: [PATCH 17/56] sort items by dragging the item header

---
 .../nestedcontent/nestedcontent.controller.js            | 7 +++++--
 .../propertyeditors/nestedcontent/nestedcontent.html     | 9 +++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index b97cbadd8d..f64ed84131 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -248,11 +248,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             var scaffold = $scope.getScaffold($scope.model.value[idx].ncContentTypeAlias);
             return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
         }
-
         $scope.sortableOptions = {
             axis: "y",
             cursor: "move",
-            handle: ".umb-nested-content__icon--move",
+            handle:'.umb-nested-content__header-bar',
+            distance: 10,
+            opacity: 0.7,
+            tolerance: "pointer",
+            scroll: true,
             start: function (ev, ui) {
                 updateModel();
                 // Yea, yea, we shouldn't modify the dom, sue me
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 0c6f2bb415..851ce44959 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -3,18 +3,15 @@
      ng-class="{'umb-nested-content--narrow':!wideMode, 'umb-nested-content--wide':wideMode}">
     <ng-form>
 
-        <div class="umb-nested-content__items" ng-hide="nodes.length == 0" ui-sortable="sortableOptions" ng-model="nodes">
+        <div class="umb-nested-content__items" ng-hide="nodes.length === 0" ui-sortable="sortableOptions" ng-model="nodes">
 
-            <div class="umb-nested-content__item" ng-repeat="node in nodes" ng-class="{ 'umb-nested-content__item--active' : $parent.realCurrentNode.key == node.key, 'umb-nested-content__item--single' : $parent.singleMode }">
+            <div class="umb-nested-content__item" ng-repeat="node in nodes" ng-class="{ 'umb-nested-content__item--active' : $parent.realCurrentNode.key === node.key, 'umb-nested-content__item--single' : $parent.singleMode }">
 
                 <div class="umb-nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">
 
                     <div class="umb-nested-content__heading"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>
 
                     <div class="umb-nested-content__icons">
-                        <a class="umb-nested-content__icon umb-nested-content__icon--move" localize="title" title="actions_move" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
-                            <i class="icon icon-navigation"></i>
-                        </a>
                         <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
                             <i class="icon icon-trash"></i>
                         </a>
@@ -25,7 +22,7 @@
 
                 </div>
 
-                <div class="umb-nested-content__content" ng-if="$parent.realCurrentNode.key == node.key && !$parent.sorting">
+                <div class="umb-nested-content__content" ng-if="$parent.realCurrentNode.key === node.key && !$parent.sorting">
                     <umb-nested-content-editor ng-model="node" tab-alias="ncTabAlias" />
                 </div>
             </div>

From 85456bbb9b6aa16b995b5d49c0660d912e2bfddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 14:59:34 +0200
Subject: [PATCH 18/56] correct lang file

---
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 3b36a5e596..a147fd4b28 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -49,9 +49,7 @@
     <key alias="setPermissions">Set permissions</key>
     <key alias="unlock">Unlock</key>
     <key alias="createblueprint">Create Content Template</key>
-    <key alias="resendInvite">Resend Invitation</key>
-    <key alias="createEmpty">Create new</key>
-    <key alias="createFromClipboard">Paste from clipboard</key>
+    <key alias="resendInvite">Resend Invitation</key>
   </area>
   <area alias="actionCategories">
     <key alias="content">Content</key>
@@ -296,7 +294,9 @@
     <key alias="readyToPublish">Ready to Publish?</key>
     <key alias="readyToSave">Ready to Save?</key>
     <key alias="sendForApproval">Send for approval</key>
-    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
   </area>
   <area alias="blueprints">
     <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
@@ -1406,7 +1406,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="deleteUserSuccess">User %0% was deleted</key>
     <key alias="resendInviteHeader">Invite user</key>
     <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
-    <key alias="contentReqCulturePublishError">Cannot publish the document since the required '%0%' is not published</key>    
+    <key alias="contentReqCulturePublishError">Cannot publish the document since the required '%0%' is not published</key>
     <key alias="contentCultureValidationError">Validation failed for language '%0%'</key>
     <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
     <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>

From 85905f7a771096b4926208668ee0ff40b02b6b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:00:31 +0200
Subject: [PATCH 19/56] fix variant error for collection tabs

---
 .../datatypepicker/datatypepicker.html        | 30 ++++++++++++-------
 .../nestedcontent/nestedcontent.controller.js |  5 ++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index 43933f8051..2755e689b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -33,9 +33,9 @@
                     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
                     <!-- TABS -->
                     <div ng-if="vm.showTabs">
-                        <umb-tabs-nav 
-                            ng-if="vm.tabs" 
-                            tabs="vm.tabs" 
+                        <umb-tabs-nav
+                            ng-if="vm.tabs"
+                            tabs="vm.tabs"
                             on-tab-change="vm.onTabChange(tab)">
                         </umb-tabs-nav>
                         <umb-tab-content ng-repeat="tab in vm.tabs" tab="tab" ng-if="tab.active">
@@ -49,8 +49,10 @@
                                             ng-click="vm.pickEditor(systemDataType)"
                                             class="-four-in-row">
                                             <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
-                                                <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
-                                                {{ systemDataType.name }}
+                                                <span>
+                                                    <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
+                                                    {{ systemDataType.name }}
+                                                </span>
                                             </a>
                                         </li>
                                     </ul>
@@ -69,8 +71,10 @@
                                                 <div class="umb-button__progress"></div>
                                             </div>
                                             <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
-                                                <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
-                                                {{ dataType.name }}
+                                                <span>
+                                                    <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
+                                                    {{ dataType.name }}
+                                                </span>
                                             </a>
                                         </li>
                                     </ul>
@@ -93,8 +97,10 @@
                                             <div class="umb-button__progress"></div>
                                         </div>
                                         <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
-                                            <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
-                                            {{ dataType.name }}
+                                            <span>
+                                                <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
+                                                {{ dataType.name }}
+                                            </span>
                                         </a>
                                     </li>
                                 </ul>
@@ -110,8 +116,10 @@
                                         ng-click="vm.pickEditor(systemDataType)"
                                         class="-four-in-row">
                                         <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
-                                            <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
-                                            {{ systemDataType.name }}
+                                            <span>
+                                                <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
+                                                {{ systemDataType.name }}
+                                            </span>
                                         </a>
                                     </li>
                                 </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index f64ed84131..b53e0c4313 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -12,8 +12,7 @@
                 ncAlias: "",
                 ncTabAlias: "",
                 nameTemplate: ""
-            }
-            );
+            });
         }
 
         $scope.remove = function (index) {
@@ -33,7 +32,7 @@
             
             // Populate document type tab dictionary
             docTypes.forEach(function (value) {
-                $scope.docTypeTabs[value.alias] = value.variants[0].tabs;
+                $scope.docTypeTabs[value.alias] = value.tabs;
             });
         });
 

From ab2f0c3a1cf7f50edabfe101f209378503a13189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:00:52 +0200
Subject: [PATCH 20/56] go to four lines if more than 6 items in Item-picker

---
 .../src/views/common/overlays/itempicker/itempicker.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index c7461cdf78..50766ab983 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -38,7 +38,7 @@
     <ul class="umb-card-grid">
         <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
             ng-click="selectItem(availableItem)"
-            class="-three-in-row">
+            ng-class="{'-three-in-row': model.availableItems < 7, '-four-in-row': model.availableItems >= 7}">
             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
                 <span>
                     <i class="{{ availableItem.icon }}"></i>

From 5942bce7da614610f9046936640efc650fcbd1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:23:56 +0200
Subject: [PATCH 21/56] control size of umb-overlay

---
 .../overlays/umboverlay.directive.js          |  1 +
 .../src/common/services/overlay.service.js    |  7 ++++++-
 .../src/less/components/card.less             |  4 ++--
 .../src/less/components/overlays.less         |  7 +++++++
 .../datatypepicker/datatypepicker.html        | 20 ++++++++-----------
 .../itempicker/itempicker.html                |  5 ++---
 .../macropicker/macropicker.html              |  5 ++---
 .../overlays/itempicker/itempicker.html       | 10 ++++------
 .../mediatypepicker/mediatypepicker.html      |  5 ++---
 .../components/overlays/umb-overlay.html      |  2 +-
 .../nestedcontent/nestedcontent.controller.js |  2 ++
 .../nestedcontent/nestedcontent.html          |  1 +
 12 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 99b89bf8cf..928e63ae56 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -511,6 +511,7 @@ Opens an overlay to show a custom YSOD. </br>
             model: "=",
             view: "=",
             position: "@",
+            size: "@?",
             parentScope: "=?"
          },
          link: link
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
index 6de0b4170b..e853e07092 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
@@ -27,6 +27,11 @@
                 overlay.position = "center";
             }
 
+            // set the default overlay size to small
+            if(!overlay.size) {
+                overlay.size = "small";
+            }
+
             // use a default empty view if nothing is set
             if(!overlay.view) {
                 overlay.view = "views/common/overlays/default/default.html";
@@ -72,4 +77,4 @@
 
     angular.module("umbraco.services").factory("overlayService", overlayService);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index c6a9212b3e..8324698685 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -101,12 +101,12 @@
     width: 100px;
 }
 
-.umb-card-grid li.-four-in-row {
+.umb-card-grid.-four-in-row li {
     flex: 0 0 25%;
     max-width: 25%;
 }
 
-.umb-card-grid li.-three-in-row {
+.umb-card-grid.-three-in-row li {
 	flex: 0 0 33.33%;
     max-width:33.33%;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index a089463a2d..12e28fe9da 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -6,6 +6,13 @@
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 50px rgba(0,0,0,0.1), 0 6px 20px rgba(0,0,0,0.16);
     text-align: left;
+    width: 400px;// default
+}
+.umb-overlay--small {
+    width: 400px;
+}
+.umb-overlay--medium {
+    width: 625px;
 }
 
 .umb-overlay__form {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index 2755e689b7..fd859b9e2e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -42,12 +42,11 @@
                             <div ng-if="tab.alias==='Default'">
                                 <div ng-repeat="(key,value) in tab.typesAndEditors">
                                     <h5>{{key}}</h5>
-                                    <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                    <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
                                         <li ng-repeat="systemDataType in value | orderBy:'name'"
                                             data-element="editor-{{systemDataType.name}}"
                                             ng-mouseover="vm.showDetailsOverlay(systemDataType)"
-                                            ng-click="vm.pickEditor(systemDataType)"
-                                            class="-four-in-row">
+                                            ng-click="vm.pickEditor(systemDataType)">
                                             <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
                                                 <span>
                                                     <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
@@ -61,12 +60,11 @@
                             <div ng-if="tab.alias==='Reuse'">
                                 <div ng-repeat="(key,value) in tab.userConfigured">
                                     <h5>{{key}}</h5>
-                                    <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                    <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
                                         <li ng-repeat="dataType in value | orderBy:'name'"
                                             data-element="editor-{{dataType.name}}"
                                             ng-mouseover="vm.showDetailsOverlay(dataType)"
-                                            ng-click="vm.pickDataType(dataType)"
-                                            class="-four-in-row">
+                                            ng-click="vm.pickDataType(dataType)">
                                             <div ng-if="dataType.loading" class="umb-card-grid-item__loading">
                                                 <div class="umb-button__progress"></div>
                                             </div>
@@ -88,11 +86,10 @@
                         <div ng-repeat="result in vm.filterResult.userConfigured">
                             <div ng-if="result.dataTypes.length > 0">
                                 <h5>{{result.group}}</h5>
-                                <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
                                     <li ng-repeat="dataType in result.dataTypes | orderBy:'name'"
                                         ng-mouseover="vm.showDetailsOverlay(dataType)"
-                                        ng-click="vm.pickDataType(dataType)"
-                                        class="-four-in-row">
+                                        ng-click="vm.pickDataType(dataType)">
                                         <div ng-if="dataType.loading" class="umb-card-grid-item__loading">
                                             <div class="umb-button__progress"></div>
                                         </div>
@@ -110,11 +107,10 @@
                         <div ng-repeat="result in vm.filterResult.typesAndEditors">
                             <div ng-if="result.dataTypes.length > 0">
                                 <h5>{{result.group}}</h5>
-                                <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                                <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
                                     <li ng-repeat="systemDataType in result.dataTypes | orderBy:'name'"
                                         ng-mouseover="vm.showDetailsOverlay(systemDataType)"
-                                        ng-click="vm.pickEditor(systemDataType)"
-                                        class="-four-in-row">
+                                        ng-click="vm.pickEditor(systemDataType)">
                                         <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
                                             <span>
                                                 <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
index aaefd80250..18d0c40b6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
@@ -24,10 +24,9 @@
                                 no-dirty-check />
                     </div>
 
-                    <ul class="umb-card-grid">
+                    <ul class="umb-card-grid -three-in-row">
                         <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
-                            ng-click="vm.selectItem(availableItem)"
-                            class="-three-in-row">
+                            ng-click="vm.selectItem(availableItem)">
                             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
                                 <span>
                                     <i class="{{ availableItem.icon }}"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index 53a2858c62..66c64657a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -29,10 +29,9 @@
                                         no-dirty-check />
                             </div>
 
-                            <ul class="umb-card-grid">
+                            <ul class="umb-card-grid -three-in-row">
                                 <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm"
-                                    ng-click="selectMacro(availableItem)"
-                                    class="-three-in-row">
+                                    ng-click="selectMacro(availableItem)">
                                     <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
                                         <span>
                                             <i class="icon-settings-alt"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 50766ab983..f9f4026d48 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -18,10 +18,9 @@
         </button>
     </div>
 
-    <ul class="umb-card-grid">
+    <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
         <li ng-repeat="pasteItem in model.pasteItems | filter:searchTerm"
-            ng-click="pasteItem(pasteItem)"
-            class="-three-in-row">
+            ng-click="pasteItem(pasteItem)">
             <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
                 <span>
                     <i class="{{ pasteItem.icon }}"></i>
@@ -35,10 +34,9 @@
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>
 
-    <ul class="umb-card-grid">
+    <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
         <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
-            ng-click="selectItem(availableItem)"
-            ng-class="{'-three-in-row': model.availableItems < 7, '-four-in-row': model.availableItems >= 7}">
+            ng-click="selectItem(availableItem)">
             <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
                 <span>
                     <i class="{{ availableItem.icon }}"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
index e7b5dddee1..161f0b1cf2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
@@ -1,10 +1,9 @@
 <div ng-controller="Umbraco.Overlays.MediaTypePickerController">
 
-  	<ul class="umb-card-grid">
+  	<ul class="umb-card-grid -three-in-row">
       <li
 	  	ng-repeat="mediatype in model.acceptedMediatypes | orderBy:'name'"
-        ng-click="select(mediatype)"
-        class="-three-in-row">
+        ng-click="select(mediatype)">
         <a class="umb-card-grid-item" href="" title="{{mediatype.name}}">
             <span>
                 <i class="{{ mediatype.icon }}"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
index aac2e2665b..f44a73ff2a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
@@ -1,4 +1,4 @@
-<div data-element="overlay" class="umb-overlay umb-overlay-{{position}}" on-outside-click="outSideClick()">
+<div data-element="overlay" class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}" on-outside-click="outSideClick()">
     <ng-form class="umb-overlay__form" name="overlayForm" novalidate val-form-manager>
 
         <div data-element="overlay-header" class="umb-overlay-header">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index b53e0c4313..a2095d098c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -158,6 +158,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 return;
             }
             
+            $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";
+            
             $scope.overlayMenu.pasteItems = [];
             var availableNodesForPaste = copyService.retriveDataOfType("elementType", contentTypeAliases);
             _.each(availableNodesForPaste, function (node) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 851ce44959..53f94bc74a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -40,6 +40,7 @@
     <umb-overlay
         ng-if="overlayMenu.show"
         position="target"
+        size="overlayMenu.size"
         view="overlayMenu.view"
         model="overlayMenu">
     </umb-overlay>

From 906c7a4ccd4a44c4b18d510a01d8fa9cb34c159b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:52:00 +0200
Subject: [PATCH 22/56] added angularJS truncate filter

---
 .../src/common/filters/truncate.filter.js     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
new file mode 100644
index 0000000000..320b380393
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
@@ -0,0 +1,19 @@
+angular.module("umbraco.filters").filter('truncate', 
+    function () {
+        return function (value, wordwise, max, tail) {
+            if (!value) return '';
+            max = parseInt(max, 10);
+            if (!max) return value;
+            if (value.length <= max) return value;
+
+            value = value.substr(0, max);
+            if (wordwise) {
+                var lastspace = value.lastIndexOf(' ');
+                if (lastspace != -1) {
+                    value = value.substr(0, lastspace);
+                }
+            }
+            return value + (tail || ' …');
+        };
+    }
+);

From b271c77d97146409fb7a85ea957c53a9d2b944c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:52:37 +0200
Subject: [PATCH 23/56] fixing size to only work for target overlay

---
 .../components/overlays/umboverlay.directive.js   |  2 +-
 .../src/less/components/overlays.less             | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 928e63ae56..a9e70cd127 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -511,7 +511,7 @@ Opens an overlay to show a custom YSOD. </br>
             model: "=",
             view: "=",
             position: "@",
-            size: "@?",
+            size: "=?",
             parentScope: "=?"
          },
          link: link
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 12e28fe9da..cfba4454df 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -6,13 +6,6 @@
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 50px rgba(0,0,0,0.1), 0 6px 20px rgba(0,0,0,0.16);
     text-align: left;
-    width: 400px;// default
-}
-.umb-overlay--small {
-    width: 400px;
-}
-.umb-overlay--medium {
-    width: 625px;
 }
 
 .umb-overlay__form {
@@ -139,6 +132,14 @@
     max-height: 100vh;
     box-sizing: border-box;
     border-radius: @baseBorderRadius;
+    /* default:
+    &.umb-overlay--small {
+        width: 400px;
+    }
+    */
+    &.umb-overlay--medium {
+        width: 480px;
+    }
 }
 
 .umb-overlay.umb-overlay-target .umb-overlay-header {

From 27d5b258dfe081ecfcfee3799b91ef6534eeb503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 30 Apr 2019 15:53:38 +0200
Subject: [PATCH 24/56] truncate + cache header for create new + different
 title for overlay depending on situation

---
 .../src/views/common/overlays/itempicker/itempicker.html | 4 ++--
 .../nestedcontent/nestedcontent.controller.js            | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index f9f4026d48..4a75b85fa7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -24,13 +24,13 @@
             <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
                 <span>
                     <i class="{{ pasteItem.icon }}"></i>
-                    {{ pasteItem.name }}
+                    {{ pasteItem.name | truncate:true:36 }}
                 </span>
             </a>
         </li>
     </ul>
 
-    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="::(model.pasteItems | filter:searchTerm).length > 0">
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index a2095d098c..c3ed35c525 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -98,8 +98,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.wideMode = Object.toBoolean($scope.model.config.hideLabel);
 
         $scope.labels = {};
-        localizationService.localizeMany(["grid_addElement"]).then(function(data) {
-            $scope.labels.docTypePickerTitle = data[0];
+        localizationService.localizeMany(["grid_addElement", "content_createEmpty"]).then(function(data) {
+            $scope.labels.grid_addElement = data[0];
+            $scope.labels.content_createEmpty = data[1];
         });
 
         // helper to force the current form into the dirty state
@@ -124,7 +125,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             }
 
             $scope.overlayMenu = {
-                title: $scope.labels.docTypePickerTitle,
                 show: false,
                 style: {},
                 filter: $scope.scaffolds.length > 15 ? true : false,
@@ -169,6 +169,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                     icon: iconHelper.convertFromLegacyIcon(node.icon)
                 });
             });
+            
+            $scope.overlayMenu.title = $scope.overlayMenu.pasteItems.length > 0 ? $scope.labels.grid_addElement : $scope.labels.content_createEmpty;
+            
             $scope.overlayMenu.clickClearPaste = function($event) {
                 $event.stopPropagation();
                 $event.preventDefault();

From 23a27c3519e59f4f7de1b658cc39c47ab869b5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 1 May 2019 09:40:38 +0200
Subject: [PATCH 25/56] adding paste feature + cleaning css

---
 .../components/overlays/umb-itempicker.less   |  3 ++
 .../less/components/umb-nested-content.less   | 49 ++++---------------
 .../overlays/itempicker/itempicker.html       |  2 +-
 .../nestedcontent/nestedcontent.controller.js | 17 +++----
 .../nestedcontent/nestedcontent.html          |  6 +--
 5 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
index 010ff4636d..3727c92251 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
@@ -1,3 +1,6 @@
 .umb-itempicker .form-search {
     margin-top:10px;
 }
+.umb-card-grid {
+    margin-top: 10px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 78cb9410d3..da62a2f36c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -87,23 +87,11 @@
 
 .umb-nested-content__icons {
     opacity: 0;
-    transition: opacity .15s ease-in-out;
+    transition: opacity 120ms ease-in-out;
     position: absolute;
-    right: 0px;
-    top: 2px;
-    background-color: @white;
+    right: 8px;
+    top: 4px;
     padding: 5px;
-
-    &:before {
-        content: ' ';
-        position: absolute;
-        display: block;
-        width: 30px;
-        left: -30px;
-        top: 0;
-        bottom: 0;
-        background: linear-gradient(90deg, rgba(255,255,255,0), white);
-    }
 }
 
 .umb-nested-content__item--active {
@@ -130,41 +118,22 @@
 
 
 
-.umb-nested-content__icon,
-.umb-nested-content__icon.umb-nested-content__icon--disabled:hover {
+.umb-nested-content__icon {
     display: inline-block;
-    padding: 4px 6px;
+    padding: 4px;
     margin: 2px;
     cursor: pointer;
-    background: @white;
-    border: 1px solid @gray-7;
-    border-radius: 200px;
-    text-decoration: none !important;
+    color: @ui-option-type;
 }
 
-.umb-nested-content__icon.umb-nested-content__icon--disabled:hover {
-    cursor: default;
-}
-
-.umb-nested-content__icon:hover,
-.umb-nested-content__icon--active
-{
-    color: @white;
-    background: @blueMid;
-    border-color: @blueMid;
+.umb-nested-content__icon:hover {
+    color: @ui-option-type-hover;
     text-decoration: none;
 }
 
-.umb-nested-content__icon .icon,
-.umb-nested-content__icon.umb-nested-content__icon--disabled:hover .icon {
+.umb-nested-content__icon .icon {
     display: block;
     font-size: 16px !important;
-    color: @gray-3;
-}
-
-.umb-nested-content__icon:hover .icon,
-.umb-nested-content__icon--active .icon {
-    color: @white;
 }
 
 .umb-nested-content__icon--disabled {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 4a75b85fa7..0fdf303c6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -20,7 +20,7 @@
 
     <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
         <li ng-repeat="pasteItem in model.pasteItems | filter:searchTerm"
-            ng-click="pasteItem(pasteItem)">
+            ng-click="model.clickPasteItem(pasteItem)">
             <a class="umb-card-grid-item" href="" title="{{ pasteItem.name }}">
                 <span>
                     <i class="{{ pasteItem.icon }}"></i>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index c3ed35c525..3643d25e42 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -127,11 +127,16 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $scope.overlayMenu = {
                 show: false,
                 style: {},
-                filter: $scope.scaffolds.length > 15 ? true : false,
+                filter: $scope.scaffolds.length > 12 ? true : false,
                 orderBy: "$index",
                 view: "itempicker",
                 event: $event,
-                submit: function(model) {                    
+                clickPasteItem: function(item) {
+                    $scope.pasteFromClipboard(item.data);
+                    $scope.overlayMenu.show = false;
+                    $scope.overlayMenu = null;
+                },
+                submit: function(model) {
                     if(model && model.selectedItem) {
                         $scope.addNode(model.selectedItem.alias);
                     }
@@ -166,6 +171,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 $scope.overlayMenu.pasteItems.push({
                     alias: node.contentTypeAlias,
                     name: node.name, //contentTypeName
+                    data: node,
                     icon: iconHelper.convertFromLegacyIcon(node.icon)
                 });
             });
@@ -310,13 +316,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $event.stopPropagation();
         }
         
-        $scope.clickPaste = function($event) {
-            
-            var newNode = copyService.retriveDataOfType("elementType", contentTypeAliases).pop();
-            $scope.pasteFromClipboard(newNode);
-            
-        }
-        
         $scope.pasteFromClipboard = function(newNode) {
             
             if (newNode === undefined) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 53f94bc74a..261f569ef5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -12,12 +12,12 @@
                     <div class="umb-nested-content__heading"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>
 
                     <div class="umb-nested-content__icons">
-                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
-                            <i class="icon icon-trash"></i>
-                        </a>
                         <a class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{copyIconTitle}}" ng-click="clickCopy($event, node);" ng-if="showCopy" prevent-default>
                             <i class="icon icon-documents"></i>
                         </a>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
+                            <i class="icon icon-trash"></i>
+                        </a>
                     </div>
 
                 </div>

From 6802716cf19b527e0fcf5ef956bf832b03075bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 1 May 2019 09:57:11 +0200
Subject: [PATCH 26/56] use requestDeleteNode

---
 .../nestedcontent/nestedcontent.controller.js             | 8 ++++++++
 .../propertyeditors/nestedcontent/nestedcontent.html      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 3643d25e42..497ed10bd5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -219,6 +219,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                 }
             }
         };
+        $scope.requestDeleteNode = function (idx) {
+            console.log("$scope.model.config.confirmDeletes", $scope.model.config.confirmDeletes)
+            if ($scope.model.config.confirmDeletes && $scope.model.config.confirmDeletes === 1) {
+                
+            } else {
+                
+            }
+        };
 
         $scope.getName = function (idx) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index 261f569ef5..235ee365c4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -15,7 +15,7 @@
                         <a class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{copyIconTitle}}" ng-click="clickCopy($event, node);" ng-if="showCopy" prevent-default>
                             <i class="icon icon-documents"></i>
                         </a>
-                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.requestDeleteNode($index); $event.stopPropagation();" prevent-default>
                             <i class="icon icon-trash"></i>
                         </a>
                     </div>

From d23f25bebaa3762a39df89897e9e9531f7adfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 1 May 2019 10:02:43 +0200
Subject: [PATCH 27/56] finishing requestDeleteNode

---
 .../nestedcontent/nestedcontent.controller.js | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index f332beb262..16d75360b0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -233,27 +233,20 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
 
         $scope.deleteNode = function (idx) {
             if ($scope.nodes.length > $scope.model.config.minItems) {
-                if ($scope.model.config.confirmDeletes && $scope.model.config.confirmDeletes === 1) {
-                    localizationService.localize("content_nestedContentDeleteItem").then(function (value) {
-                        if (confirm(value)) {
-                            $scope.nodes.splice(idx, 1);
-                            $scope.setDirty();
-                            updateModel();
-                        }
-                    });
-                } else {
-                    $scope.nodes.splice(idx, 1);
-                    $scope.setDirty();
-                    updateModel();
-                }
+                $scope.nodes.splice(idx, 1);
+                $scope.setDirty();
+                updateModel();
             }
         };
         $scope.requestDeleteNode = function (idx) {
-            console.log("$scope.model.config.confirmDeletes", $scope.model.config.confirmDeletes)
-            if ($scope.model.config.confirmDeletes && $scope.model.config.confirmDeletes === 1) {
-                
+            if ($scope.model.config.confirmDeletes === true) {
+                localizationService.localize("content_nestedContentDeleteItem").then(function (value) {
+                    if (confirm(value)) {
+                        $scope.deleteNode(idx);
+                    }
+                });
             } else {
-                
+                $scope.deleteNode(idx);
             }
         };
 

From 5d5fa3fac80adcdcc79d11be313a20fd7dcac67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 1 May 2019 10:14:33 +0200
Subject: [PATCH 28/56] changed localstorage key to umbCopyService

---
 src/Umbraco.Web.UI.Client/src/common/services/copy.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index abfd6e71e6..a0275c69ed 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -1,7 +1,7 @@
 function copyService(notificationsService, eventsService) {
     
     
-    var STORAGE_KEY = "uCopyService";
+    var STORAGE_KEY = "umbCopyService";
     
     var supportsLocalStorage = function () {
         var test = "test";

From 6b17248f64da002fe28a1644451bc3772781e543 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Wed, 1 May 2019 15:22:10 +0200
Subject: [PATCH 29/56] Updating base link

---
 build/build-docs.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-docs.ps1 b/build/build-docs.ps1
index 15a150ce25..8cd3f090c7 100644
--- a/build/build-docs.ps1
+++ b/build/build-docs.ps1
@@ -16,7 +16,7 @@ cd .\src\Umbraco.Web.UI.Client
 & gulp docs | Out-Null
 
 # change baseUrl
-$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
+$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
 $IndexPath = "./docs/api/index.html"
 (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
 

From adf762bdf80188a7b40e0e1af9bac64fbad4f61f Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Wed, 1 May 2019 15:25:47 +0200
Subject: [PATCH 30/56] Integrate docs script with the main build script

---
 build/build.ps1 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/build/build.ps1 b/build/build.ps1
index 1088da33bc..290f3ef094 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -424,6 +424,56 @@
     Write-Host "Prepare Azure Gallery"
     $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
   })
+  
+  $ubuild.DefineMethod("PrepareCSharpDocs",
+  {
+    Write-Host "Prepare C# Documentation"
+	
+	$src = "$($this.SolutionRoot)\src"
+    $tmp = $this.BuildTemp
+    $out = $this.BuildOutput
+	$DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
+	$DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
+	
+	# Build the solution in debug mode
+	$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
+
+	#restore nuget packages
+	$this.RestoreNuGet()
+
+	# run DocFx
+	$DocFx = $this.BuildEnv.DocFx
+	
+	& $DocFx metadata $DocFxJson
+	& $DocFx build $DocFxJson
+
+	# zip it
+	& $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
+  })
+  
+  $ubuild.DefineMethod("PrepareAngularDocs",
+  {
+    Write-Host "Prepare Angular Documentation"
+	
+	$src = "$($this.SolutionRoot)\src"
+    $out = $this.BuildOutput
+	
+	$this.CompileBelle()
+
+	"Moving to Umbraco.Web.UI.Client folder"
+	cd .\src\Umbraco.Web.UI.Client
+
+	"Generating the docs and waiting before executing the next commands"
+	& gulp docs | Out-Null
+
+	# change baseUrl
+	$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
+	$IndexPath = "./docs/api/index.html"
+	(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+
+	# zip it
+	& $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
+  })
 
   $ubuild.DefineMethod("Build",
   {

From 6cd77df1ad03db2902c3c330e8efbe1ac3fbc135 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Wed, 1 May 2019 15:30:58 +0200
Subject: [PATCH 31/56] Updating the base link

---
 build/build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 290f3ef094..6731767be5 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -467,7 +467,7 @@
 	& gulp docs | Out-Null
 
 	# change baseUrl
-	$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
+	$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
 	$IndexPath = "./docs/api/index.html"
 	(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
 

From 8031562ea2d3a96663fc951c519a3030f40dc72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 2 May 2019 10:54:59 +0200
Subject: [PATCH 32/56] better focus state

---
 .../src/controllers/main.controller.js        |  4 ++++
 .../src/less/components/umb-form-check.less   | 23 ++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index 269e269be8..841e22f855 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -24,7 +24,9 @@ function MainController($scope, $location, appState, treeService, notificationsS
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
     function handleFirstTab(evt) {
         if (evt.keyCode === 9) {
+            console.log("handleFirstTab")
             $scope.tabbingActive = true;
+            $scope.$digest();
             window.removeEventListener('keydown', handleFirstTab);
             window.addEventListener('mousedown', disableTabbingActive);
         }
@@ -32,6 +34,8 @@ function MainController($scope, $location, appState, treeService, notificationsS
     
     function disableTabbingActive(evt) {
         $scope.tabbingActive = false;
+        $scope.$digest();
+            console.log("disableTabbingActive")
         window.removeEventListener('mousedown', disableTabbingActive);
         window.addEventListener("keydown", handleFirstTab);
     }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 4446ead255..32edb8c850 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -30,23 +30,13 @@
         }
         &:checked ~ .umb-form-check__state .umb-form-check__check {
             border-color: @ui-option-type;
-            background-color: @ui-option-type;
         }
         &:checked:hover ~ .umb-form-check__state .umb-form-check__check {
             &::before {
                 background: @ui-option-type-hover;
             }
         }
-
-        &:focus:checked ~ .umb-form-check .umb-form-check__check,
-        &:focus ~ .umb-form-check__state .umb-form-check__check {
-            border-color: @inputBorderFocus;
-            
-            .tabbing-active & {
-                outline: 2px solid @inputBorderTabFocus;
-            }
-        }
-
+        
         &:checked ~ .umb-form-check__state {
             .umb-form-check__check {
                 // This only happens if the state has a radiobutton modifier
@@ -72,6 +62,17 @@
             }
         }
     }
+    
+    
+    .tabbing-active &.umb-form-check--radiobutton &__input:focus ~ .umb-form-check__state .umb-form-check__check {
+        //outline: 2px solid @inputBorderTabFocus;
+        border: 2px solid @inputBorderTabFocus;
+        margin: -1px;
+    }
+    .tabbing-active &.umb-form-check--checkbox &__input:focus ~ .umb-form-check__state .umb-form-check__check {
+        outline: 2px solid @inputBorderTabFocus;
+        border-color: white;
+    }
 
     &__state {
         display: flex;

From fe3c1bc0891f8de95047e7bc06d5ab785e1475ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 2 May 2019 13:25:19 +0200
Subject: [PATCH 33/56] remove console.log

---
 src/Umbraco.Web.UI.Client/src/controllers/main.controller.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index 841e22f855..48f773f2a1 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -24,7 +24,6 @@ function MainController($scope, $location, appState, treeService, notificationsS
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
     function handleFirstTab(evt) {
         if (evt.keyCode === 9) {
-            console.log("handleFirstTab")
             $scope.tabbingActive = true;
             $scope.$digest();
             window.removeEventListener('keydown', handleFirstTab);
@@ -35,7 +34,6 @@ function MainController($scope, $location, appState, treeService, notificationsS
     function disableTabbingActive(evt) {
         $scope.tabbingActive = false;
         $scope.$digest();
-            console.log("disableTabbingActive")
         window.removeEventListener('mousedown', disableTabbingActive);
         window.addEventListener("keydown", handleFirstTab);
     }

From 3a5538730b8268ff4084d38d4324c3928945d4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 2 May 2019 13:32:16 +0200
Subject: [PATCH 34/56] only remove gray border when checked.

---
 .../src/less/components/umb-form-check.less                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 32edb8c850..d8a5ebf9d8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -71,6 +71,8 @@
     }
     .tabbing-active &.umb-form-check--checkbox &__input:focus ~ .umb-form-check__state .umb-form-check__check {
         outline: 2px solid @inputBorderTabFocus;
+    }
+    .tabbing-active &.umb-form-check--checkbox &__input:checked:focus ~ .umb-form-check__state .umb-form-check__check {
         border-color: white;
     }
 

From 07f4295810c972e039c83d249c9a05eeca2c9878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 6 May 2019 14:18:15 +0200
Subject: [PATCH 35/56] rename copyService to clipboardService

---
 .../src/common/services/copy.service.js       | 24 ++++++++++++++-----
 .../nestedcontent/nestedcontent.controller.js | 18 +++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index a0275c69ed..6388090705 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -1,7 +1,19 @@
-function copyService(notificationsService, eventsService) {
+/**
+ * @ngdoc service
+ * @name umbraco.services.clipboardService
+ *
+ * @requires notificationsService
+ * @requires eventsService
+ *
+ * @description
+ * Service to handle clipboard in general across the application. Responsible for handling the data both storing and retrive.
+ * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
+ *
+ */
+function clipboardService(notificationsService, eventsService) {
     
     
-    var STORAGE_KEY = "umbCopyService";
+    var STORAGE_KEY = "umbClipboardService";
     
     var supportsLocalStorage = function () {
         var test = "test";
@@ -47,7 +59,7 @@ function copyService(notificationsService, eventsService) {
             var storageJSON = JSON.parse(storageString);
             window.localStorage.setItem(STORAGE_KEY, storageString);
             
-            eventsService.emit("copyService.storageUpdate");
+            eventsService.emit("clipboardService.storageUpdate");
             
             return true;
         } catch(e) {
@@ -62,8 +74,8 @@ function copyService(notificationsService, eventsService) {
     
     /**
     * @ngdoc method
-    * @name umbraco.services.copyService#copy
-    * @methodOf umbraco.services.copyService
+    * @name umbraco.services.clipboardService#copy
+    * @methodOf umbraco.services.clipboardService
     *
     * @description
     * Saves a JS-object to the LocalStage of copied entries.
@@ -146,4 +158,4 @@ function copyService(notificationsService, eventsService) {
     
     return service;
 }


-angular.module("umbraco.services").factory("copyService", copyService);

+angular.module("umbraco.services").factory("clipboardService", clipboardService);

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 16d75360b0..0416c5cfc1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -91,10 +91,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
     "contentResource",
     "localizationService",
     "iconHelper",
-    "copyService",
+    "clipboardService",
     "eventsService",
     
-    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, copyService, eventsService) {
+    function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService) {
 
         var inited = false;
         
@@ -195,7 +195,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";
             
             $scope.overlayMenu.pasteItems = [];
-            var availableNodesForPaste = copyService.retriveDataOfType("elementType", contentTypeAliases);
+            var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", contentTypeAliases);
             _.each(availableNodesForPaste, function (node) {
                 $scope.overlayMenu.pasteItems.push({
                     alias: node.contentTypeAlias,
@@ -210,8 +210,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             $scope.overlayMenu.clickClearPaste = function($event) {
                 $event.stopPropagation();
                 $event.preventDefault();
-                copyService.clearEntriesOfType("elementType", contentTypeAliases);
-                $scope.overlayMenu.pasteItems = [];// This dialog is not connected via the copyService events, so we need to update manually.
+                clipboardService.clearEntriesOfType("elementType", contentTypeAliases);
+                $scope.overlayMenu.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
             };
             
             if ($scope.overlayMenu.availableItems.length === 1 && $scope.overlayMenu.pasteItems.length === 0) {
@@ -334,7 +334,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             });
         }
         
-        $scope.showCopy = copyService.supportsCopy();
+        $scope.showCopy = clipboardService.supportsCopy();
         
         $scope.showPaste = false;
         
@@ -342,7 +342,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             
             syncCurrentNode();
             
-            copyService.copy("elementType", node);
+            clipboardService.copy("elementType", node);
             $event.stopPropagation();
         }
         
@@ -362,10 +362,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         }
         
         function checkAbilityToPasteContent() {
-            $scope.showPaste = copyService.hasEntriesOfType("elementType", contentTypeAliases);
+            $scope.showPaste = clipboardService.hasEntriesOfType("elementType", contentTypeAliases);
         }
         
-        eventsService.on("copyService.storageUpdate", checkAbilityToPasteContent);
+        eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
         
         var notSupported = [
           "Umbraco.Tags",

From bfdeb6c9873984a87430b792e7c5f480e3f66c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 6 May 2019 14:23:25 +0200
Subject: [PATCH 36/56] requires alias to be parsed in copy method + minor
 renaming

---
 .../src/common/services/copy.service.js       | 20 +++++++++----------
 .../nestedcontent/nestedcontent.controller.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index 6388090705..8bf02e2e97 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -81,7 +81,7 @@ function clipboardService(notificationsService, eventsService) {
     * Saves a JS-object to the LocalStage of copied entries.
     *
     */
-    service.copy = function(nodeType, data) {
+    service.copy = function(type, alias, data) {
         
         var storage = retriveStorage();
         
@@ -98,7 +98,7 @@ function clipboardService(notificationsService, eventsService) {
             }
         );
         
-        var entry = {unique:key, nodeType:nodeType, data:shallowCloneData};
+        var entry = {unique:key, type:type, alias:alias, data:shallowCloneData};
         storage.entries.push(entry);
         
         if (saveStorage(storage) === true) {
@@ -111,41 +111,41 @@ function clipboardService(notificationsService, eventsService) {
     
     service.supportsCopy = supportsLocalStorage;
     
-    service.hasEntriesOfType = function(nodeType, nodeTypeAliases) {
+    service.hasEntriesOfType = function(type, aliases) {
         
-        if(service.retriveEntriesOfType(nodeType, nodeTypeAliases).length > 0) {
+        if(service.retriveEntriesOfType(type, aliases).length > 0) {
             return true;
         }
         
         return false;
     };
     
-    service.retriveEntriesOfType = function(nodeType, nodeTypeAliases) {
+    service.retriveEntriesOfType = function(type, aliases) {
         
         var storage = retriveStorage();
         
         // Find entries that are furfilling the criterias for this nodeTYpe and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
-                return (entry.nodeType === nodeType && nodeTypeAliases.filter(alias => alias === entry.data.contentTypeAlias).length > 0);
+                return (entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
             }
         );
         
         return filteretEntries;
     };
     
-    service.retriveDataOfType = function(nodeType, nodeTypeAliases) {
-        return service.retriveEntriesOfType(nodeType, nodeTypeAliases).map((x) => x.data);
+    service.retriveDataOfType = function(type, aliases) {
+        return service.retriveEntriesOfType(type, aliases).map((x) => x.data);
     };
     
-    service.clearEntriesOfType = function(nodeType, nodeTypeAliases) {
+    service.clearEntriesOfType = function(type, aliases) {
         
         var storage = retriveStorage();
         
         // Find entries that are NOT furfilling the criterias for this nodeTYpe and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
-                return !(entry.nodeType === nodeType && nodeTypeAliases.filter(alias => alias === entry.data.contentTypeAlias).length > 0);
+                return !(entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
             }
         );
         
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 0416c5cfc1..6532342074 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -342,7 +342,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             
             syncCurrentNode();
             
-            clipboardService.copy("elementType", node);
+            clipboardService.copy("elementType", node.contentTypeAlias, node);
             $event.stopPropagation();
         }
         

From 74cbff5ee55bc699ad4759456b11246382d3ff3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 6 May 2019 14:27:15 +0200
Subject: [PATCH 37/56] minor rename

---
 .../src/common/services/copy.service.js       | 22 ++++++++++++++++---
 .../nestedcontent/nestedcontent.controller.js |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index 8bf02e2e97..44bd2430c9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -78,8 +78,7 @@ function clipboardService(notificationsService, eventsService) {
     * @methodOf umbraco.services.clipboardService
     *
     * @description
-    * Saves a JS-object to the LocalStage of copied entries.
-    *
+    * Saves a single JS-object with a type and alias to the clipboard.
     */
     service.copy = function(type, alias, data) {
         
@@ -109,8 +108,25 @@ function clipboardService(notificationsService, eventsService) {
         
     };
     
-    service.supportsCopy = supportsLocalStorage;
     
+    /**
+    * @ngdoc method
+    * @name umbraco.services.supportsCopy#supported
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @description
+    * Determins wether the current browser is able to performe its actions.
+    */
+    service.isSupported = supportsLocalStorage;
+    
+    /**
+    * @ngdoc method
+    * @name umbraco.services.supportsCopy#copy
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @description
+    * Determins wether the current browser is able to performe a copy-action.
+    */
     service.hasEntriesOfType = function(type, aliases) {
         
         if(service.retriveEntriesOfType(type, aliases).length > 0) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 6532342074..7a67e07e0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -334,7 +334,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             });
         }
         
-        $scope.showCopy = clipboardService.supportsCopy();
+        $scope.showCopy = clipboardService.isSupported();
         
         $scope.showPaste = false;
         

From 4c1129e9446acb14962098c709493aa7c4e653a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 6 May 2019 14:30:23 +0200
Subject: [PATCH 38/56] added missing documentation

---
 .../src/common/services/copy.service.js       | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
index 44bd2430c9..b5d7272962 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
@@ -34,7 +34,6 @@ function clipboardService(notificationsService, eventsService) {
             return null;
         }
         
-        
         var dataJSON;
         var dataString = window.localStorage.getItem(STORAGE_KEY);
         if (dataString != null) {
@@ -121,11 +120,11 @@ function clipboardService(notificationsService, eventsService) {
     
     /**
     * @ngdoc method
-    * @name umbraco.services.supportsCopy#copy
+    * @name umbraco.services.supportsCopy#hasEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
     * @description
-    * Determins wether the current browser is able to performe a copy-action.
+    * Determins wether the current clipboard has entries that matches given type and a one of the aliases.
     */
     service.hasEntriesOfType = function(type, aliases) {
         
@@ -136,11 +135,19 @@ function clipboardService(notificationsService, eventsService) {
         return false;
     };
     
+    /**
+    * @ngdoc method
+    * @name umbraco.services.supportsCopy#retriveEntriesOfType
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @description
+    * Returns an array of entries matching the given type and one of the provided aliases.
+    */
     service.retriveEntriesOfType = function(type, aliases) {
         
         var storage = retriveStorage();
         
-        // Find entries that are furfilling the criterias for this nodeTYpe and nodeTypesAliases.
+        // Find entries that are furfilling the criterias for this nodeType and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
                 return (entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
@@ -150,15 +157,31 @@ function clipboardService(notificationsService, eventsService) {
         return filteretEntries;
     };
     
+    /**
+    * @ngdoc method
+    * @name umbraco.services.supportsCopy#retriveEntriesOfType
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @description
+    * Returns an array of data of entries matching the given type and one of the provided aliases.
+    */
     service.retriveDataOfType = function(type, aliases) {
         return service.retriveEntriesOfType(type, aliases).map((x) => x.data);
     };
     
+    /**
+    * @ngdoc method
+    * @name umbraco.services.supportsCopy#retriveEntriesOfType
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @description
+    * Removes entries matching the given type and one of the provided aliases.
+    */
     service.clearEntriesOfType = function(type, aliases) {
         
         var storage = retriveStorage();
         
-        // Find entries that are NOT furfilling the criterias for this nodeTYpe and nodeTypesAliases.
+        // Find entries that are NOT furfilling the criterias for this nodeType and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
                 return !(entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);

From 4b55f99493ff38b943e1954e266ae39aa66e4895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 7 May 2019 09:08:32 +0200
Subject: [PATCH 39/56] rename copy.service to clipboard.service

---
 .../src/common/services/{copy.service.js => clipboard.service.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/common/services/{copy.service.js => clipboard.service.js} (100%)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/copy.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
rename to src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js

From c4dbb90d1075b9a1fcd461f52f3c4c60bbb48111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 7 May 2019 10:46:52 +0200
Subject: [PATCH 40/56] remember focus from before opening search

---
 .../application/umbappheader.directive.js     |  8 ++-
 .../application/umbsearch.directive.js        | 14 +++-
 .../components/forms/hotkey.directive.js      |  8 ++-
 .../src/common/services/focus.service.js      | 72 +++++++++++++++++++
 .../src/controllers/main.controller.js        |  4 +-
 .../application/umb-app-header.html           |  5 +-
 6 files changed, 100 insertions(+), 11 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/services/focus.service.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
index 3ddb7af0e1..ead54b3fc3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function AppHeaderDirective(eventsService, appState, userService) {
+    function AppHeaderDirective(eventsService, appState, userService, focusService) {
 
         function link(scope, el, attr, ctrl) {
 
@@ -54,7 +54,9 @@
                     }
                 });
             }));
-
+            
+            scope.rememberFocus = focusService.rememberFocus;
+            
             scope.searchClick = function() {
                 var showSearch = appState.getSearchState("show");
                 appState.setSearchState("show", !showSearch);
@@ -101,4 +103,4 @@
 
     angular.module("umbraco.directives").directive("umbAppHeader", AppHeaderDirective);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
index 7ff76d5670..30551bff09 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
@@ -13,7 +13,7 @@
         }
     };
     
-    function umbSearchController($timeout, backdropService, searchService) {
+    function umbSearchController($timeout, backdropService, searchService, focusService) {
 
         var vm = this;
 
@@ -25,6 +25,9 @@
         vm.handleKeyUp = handleKeyUp;
         vm.closeSearch = closeSearch;
         vm.focusSearch = focusSearch;
+        
+        //we need to capture the focus before this element is initialized.
+        vm.focusBeforeOpening = focusService.lastKnownFocus;
 
         function onInit() {
             vm.searchQuery = "";
@@ -70,6 +73,10 @@
          * @param {object} event
          */
         function handleKeyUp(event) {
+            
+            event.stopPropagation();
+            event.preventDefault();
+            
             // esc
             if(event.keyCode === 27) {
                 closeSearch();
@@ -80,6 +87,9 @@
          * Used to proxy a callback
          */
         function closeSearch() {
+            if(vm.focusBeforeOpening) {
+                vm.focusBeforeOpening.focus();
+            }
             if(vm.onClose) {
                 vm.onClose();
             }
@@ -115,4 +125,4 @@
 
     angular.module('umbraco.directives').component('umbSearch', umbSearch);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
index b4040d1c77..1b6fc9f4bb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
@@ -4,7 +4,7 @@
 **/
 
 angular.module("umbraco.directives")
-    .directive('hotkey', function($window, keyboardService, $log) {
+    .directive('hotkey', function($window, keyboardService, $log, focusService) {
 
         return function(scope, el, attrs) {
 
@@ -28,7 +28,9 @@ angular.module("umbraco.directives")
                     }
 
                     keyboardService.bind(keyCombo, function() {
-
+                        
+                        focusService.rememberFocus();
+                        
                         var element = $(el);
                         var activeElementType = document.activeElement.tagName;
                         var clickableElements = ["A", "BUTTON"];
@@ -47,6 +49,8 @@ angular.module("umbraco.directives")
                                 } else {
                                     element.trigger("click");
                                 }
+                                
+                                keyboardService.stopPropagation()
 
                             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
new file mode 100644
index 0000000000..da381a6cc4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
@@ -0,0 +1,72 @@
+/**
+ @ngdoc service
+ * @name umbraco.services.focusService
+ *
+ * @description
+ * <b>Added in Umbraco 8.1</b>. Application-wide service for focus related stuff.
+ * 
+ */
+
+(function () {
+    "use strict";
+
+    function focusService() {
+        
+        
+        function focusInApp(e) {
+            service.currentFocus = e.target;
+        }
+        document.addEventListener('focusin', focusInApp);
+        
+        
+        var service = {
+            currentFocus: null,
+            
+            /**
+    		 * @ngdoc property
+             * @name umbraco.services.focusService#lastKnownFocus
+		     * @propertyOf umbraco.services.focusService
+             *
+             * @description
+             * A element set to be remembered, the directive using this should store the value of this to make sure that its not changed white using that directive.
+             * This variable is avaiable for directives that are not able to figure out the focused element on init, and there this service will help remembering it untill the directive is initialized.
+             * 
+             */
+            lastKnownFocus: null,
+            
+            /**
+             * @ngdoc function
+             * @name umbraco.services.focusService#rememberFocus
+             * @methodOf umbraco.services.focusService
+             * @function
+             *
+             * @description
+             * Call this before a new focus is begin set, to be able to return to the focus before a given scenario.
+             * 
+             */
+            rememberFocus: function() {
+                service.lastKnownFocus = service.currentFocus;
+            },
+            
+            /**
+             * @ngdoc function
+             * @name umbraco.services.focusService#setLastKnownFocus
+             * @methodOf umbraco.services.focusService
+             * @function
+             *
+             * @description
+             * Overwrite the element remembered as the last known element in focus.
+             * 
+             */
+            setLastKnownFocus: function(element) {
+                service.lastKnownFocus = element;
+            }
+        };
+
+        return service;
+
+    }
+    
+    angular.module("umbraco.services").factory("focusService", focusService);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
index 269e269be8..59c437dc88 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
@@ -8,7 +8,9 @@
  * The main application controller
  * 
  */
-function MainController($scope, $location, appState, treeService, notificationsService, userService, historyService, updateChecker, assetsService, eventsService, tmhDynamicLocale, localStorageService, editorService, overlayService) {
+function MainController($scope, $location, appState, treeService, notificationsService, 
+    userService, historyService, updateChecker, assetsService, eventsService, 
+    tmhDynamicLocale, localStorageService, editorService, overlayService, focusService) {
 
     //the null is important because we do an explicit bool check on this in the view
     $scope.authenticated = null;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
index 07d25e7465..a14e930b8a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
@@ -1,7 +1,7 @@
 <div>
 
     <div class="umb-app-header">
-        
+
         <umb-sections
             ng-if="authenticated"
             sections="sections">
@@ -10,7 +10,7 @@
         <div class="flex items-center">
             <ul class="umb-app-header__actions">
                 <li data-element="global-search" class="umb-app-header__action">
-                    <a href="#" hotkey="ctrl+space" ng-click="searchClick()" prevent-default style="font-size: 20px;">
+                    <a href="#" hotkey="ctrl+space" ng-click="searchClick()" ng-mousedown="rememberFocus()" prevent-default style="font-size: 20px;">
                         <i class="umb-app-header__action-icon icon-search"></i>
                     </a>
                 </li>
@@ -44,4 +44,3 @@
     </umb-overlay>
 
 </div>
-

From e906808a9be56f8034d0d5332135de78e50305a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 7 May 2019 10:59:09 +0200
Subject: [PATCH 41/56] unbind keyboard shortcuts for editors when backdrop is
 active

---
 .../components/forms/hotkey.directive.js      |  2 -
 .../overlays/umboverlay.directive.js          |  3 +-
 .../src/common/services/editor.service.js     | 51 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
index 1b6fc9f4bb..8db301da55 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
@@ -49,8 +49,6 @@ angular.module("umbraco.directives")
                                 } else {
                                     element.trigger("click");
                                 }
-                                
-                                keyboardService.stopPropagation()
 
                             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 99b89bf8cf..e411be2c83 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -295,7 +295,8 @@ Opens an overlay to show a custom YSOD. </br>
                           scope.closeOverLay();
                       });
                   }
-
+                  
+                  event.stopPropagation();
                   event.preventDefault();
                }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 4357caf5be..a97773f77e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -164,9 +164,22 @@ When building a custom infinite editor view you can use the same components as a
     "use strict";
 
     function editorService(eventsService, keyboardService, $timeout) {
-
+        
+        
         let editorsKeyboardShorcuts = [];
         var editors = [];
+        var isEnabled = true;
+        
+        
+        // events for backdrop
+        eventsService.on("appState.backdrop", function (name, args) {
+            if (args.show === true) {
+                blur();
+            } else {
+                focus();
+            }
+        });
+        
 
         /**
          * @ngdoc method
@@ -191,7 +204,43 @@ When building a custom infinite editor view you can use the same components as a
         function getNumberOfEditors() {
             return editors.length;
         };
+        
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#blur
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Method to tell editors that they are begin blurred.
+         */
+        function blur() {
 
+            /* keyboard shortcuts will be overwritten by the new infinite editor
+                so we need to store the shortcuts for the current editor so they can be rebound
+                when the infinite editor closes
+            */
+            unbindKeyboardShortcuts();
+            isEnabled = false;
+        }
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#blur
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Method to tell editors that they are gaining focus again.
+         */
+        function focus() {
+            if(isEnabled === false) {
+                /* keyboard shortcuts will be overwritten by the new infinite editor
+                    so we need to store the shortcuts for the current editor so they can be rebound
+                    when the infinite editor closes
+                */
+                rebindKeyboardShortcuts();
+                isEnabled = true;
+            }
+        }
+        
         /**
          * @ngdoc method
          * @name umbraco.services.editorService#open

From 6baea68a7d5e8320037c10cfc5110ac56be926cd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 8 May 2019 07:53:11 +0200
Subject: [PATCH 42/56] Fix duplicate alias exception in "convert media URLs"
 migration

---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index ab8e1cd4d6..c5325574a9 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
 
             var sqlPropertyData = Sql()
                 .Select<PropertyDataDto>()
-                    .AndSelect<PropertyTypeDto>()
+                    .AndSelect<PropertyTypeDto>(x => x.Alias)
                     .AndSelect<DataTypeDto>()
                 .From<PropertyDataDto>()
                     .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)

From 6cf82669fbe18f49f1e2d878b55e301f7c1abb7c Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Wed, 8 May 2019 10:52:05 +0200
Subject: [PATCH 43/56] Update media urls migration to only fetch/update needed
 fields from db

---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index c5325574a9..50c7daf65d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -26,9 +26,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                 RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
             var sqlPropertyData = Sql()
-                .Select<PropertyDataDto>()
-                    .AndSelect<PropertyTypeDto>(x => x.Alias)
-                    .AndSelect<DataTypeDto>()
+                .Select<PropertyDataDto>(x => x.Id, x => x.TextValue)
+                    .AndSelect<DataTypeDto>(x => x.EditorAlias)
                 .From<PropertyDataDto>()
                     .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
                     .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.NodeId)
@@ -64,7 +63,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                     property.TextValue = UpdateMediaUrls(mediaLinkPattern, value);
                 }
 
-                Database.Update(property);
+                Database.Update(property, x => x.TextValue);
             }
 
             Context.AddPostMigration<RebuildPublishedSnapshot>();

From fc0f996500df32128bb2f263d9293751aa986177 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 8 May 2019 12:11:06 +0200
Subject: [PATCH 44/56] Excluding no longer needed paths.

---
 src/ApiDocs/docfx.json | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 21f310fec6..76677d45d5 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -10,8 +10,7 @@
           ],
           "exclude": [
             "**/obj/**",
-            "**/bin/**",
-            "../../build.tmp/_site/**"
+            "**/bin/**"
           ]
         }
       ],
@@ -35,19 +34,7 @@
           "*.md"
         ],
         "exclude": [
-          "obj/**",
-          "../../build.tmp/_site/**"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "images/**"
-        ],
-        "exclude": [
-          "obj/**",
-          "../../build.tmp/_site/**"
+          "obj/**"
         ]
       }
     ],
@@ -57,8 +44,7 @@
           "**.md"
         ],
         "exclude": [
-          "obj/**",
-          "../../build.tmp/_site/**"
+          "obj/**"
         ]
       }
     ],

From 3d80d511a46673008d6f95bc055162096c670f01 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Wed, 8 May 2019 14:27:44 +0200
Subject: [PATCH 45/56] Adding a parameter for enabling docfx into the script.

---
 build/build.ps1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/build.ps1 b/build/build.ps1
index 6731767be5..f1855833a8 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -11,6 +11,11 @@
     [Alias("loc")]
     [switch] $local = $false,
 
+	# enable docfx
+    [Parameter(Mandatory=$false)]
+    [Alias("doc")]
+    [switch] $docfx = $false,
+	
     # keep the build directories, don't clear them
     [Parameter(Mandatory=$false)]
     [Alias("c")]
@@ -31,7 +36,7 @@
   $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
   if (-not $?) { return }
   $ubuild.Boot($PSScriptRoot,
-    @{ Local = $local; },
+    @{ Local = $local; WithDocFx = $docfx },
     @{ Continue = $continue })
   if ($ubuild.OnError()) { return }
 

From 4c23d7fec9f2c66b1f66c2757731bd0ecf63b4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 8 May 2019 15:09:01 +0200
Subject: [PATCH 46/56] removed properties, replaced with a getter method.

---
 .../components/application/umbsearch.directive.js |  2 +-
 .../src/common/services/focus.service.js          | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
index 30551bff09..91eb077ba3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
@@ -27,7 +27,7 @@
         vm.focusSearch = focusSearch;
         
         //we need to capture the focus before this element is initialized.
-        vm.focusBeforeOpening = focusService.lastKnownFocus;
+        vm.focusBeforeOpening = focusService.getLastKnownFocus();
 
         function onInit() {
             vm.searchQuery = "";
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
index da381a6cc4..ebaff7eb89 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
@@ -13,14 +13,17 @@
     function focusService() {
         
         
+        var currentFocus = null;
+        var lastKnownFocus = null;
+        
+        
         function focusInApp(e) {
-            service.currentFocus = e.target;
+            currentFocus = e.target;
         }
         document.addEventListener('focusin', focusInApp);
         
         
         var service = {
-            currentFocus: null,
             
             /**
     		 * @ngdoc property
@@ -32,7 +35,9 @@
              * This variable is avaiable for directives that are not able to figure out the focused element on init, and there this service will help remembering it untill the directive is initialized.
              * 
              */
-            lastKnownFocus: null,
+            getLastKnownFocus: function() {
+                return lastKnownFocus;
+            },
             
             /**
              * @ngdoc function
@@ -45,7 +50,7 @@
              * 
              */
             rememberFocus: function() {
-                service.lastKnownFocus = service.currentFocus;
+                lastKnownFocus = currentFocus;
             },
             
             /**
@@ -59,7 +64,7 @@
              * 
              */
             setLastKnownFocus: function(element) {
-                service.lastKnownFocus = element;
+                lastKnownFocus = element;
             }
         };
 

From b95215602785dae29f2c1ff7635d0dbd564f7469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 8 May 2019 15:10:46 +0200
Subject: [PATCH 47/56] corrected documentation

---
 .../src/common/services/focus.service.js                 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
index ebaff7eb89..3979f194b8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
@@ -26,12 +26,13 @@
         var service = {
             
             /**
-    		 * @ngdoc property
-             * @name umbraco.services.focusService#lastKnownFocus
-		     * @propertyOf umbraco.services.focusService
+            * @ngdoc function
+            * @name umbraco.services.focusService#getLastKnownFocus
+            * @methodOf umbraco.services.focusService
+            * @function
              *
              * @description
-             * A element set to be remembered, the directive using this should store the value of this to make sure that its not changed white using that directive.
+             * Gives the element that was set to be remembered, the directive using this should store the value of this to make sure that its not changed white using that directive.
              * This variable is avaiable for directives that are not able to figure out the focused element on init, and there this service will help remembering it untill the directive is initialized.
              * 
              */

From 9c599868cc00316fa808bd49ca9f2cd9002800c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 9 May 2019 14:38:13 +0200
Subject: [PATCH 48/56] documentation for truncate fitler + only space between
 dots and words in wordwise mode.

---
 .../src/common/filters/truncate.filter.js          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
index 320b380393..5efe0f5fff 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
@@ -1,3 +1,15 @@
+/**
+ * @ngdoc filter
+ * @name umbraco.filters.filter:truncate
+ * @namespace truncateFilter
+ * 
+ * param {any} wordwise if true, the string will be cut after last fully displayed word.
+ * param {any} max max length of the outputtet string
+ * param {any} tail option tail, defaults to: ' ...'
+ *
+ * @description
+ * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available.
+ */
 angular.module("umbraco.filters").filter('truncate', 
     function () {
         return function (value, wordwise, max, tail) {
@@ -13,7 +25,7 @@ angular.module("umbraco.filters").filter('truncate',
                     value = value.substr(0, lastspace);
                 }
             }
-            return value + (tail || ' …');
+            return value + (tail || (wordwise ? ' …' : '…'));
         };
     }
 );

From 041fdc40e7dee6d7c26dae9e5ae31b810b432fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 9 May 2019 15:02:22 +0200
Subject: [PATCH 49/56] using localStorageService + applied further
 documentation

---
 .../src/common/services/clipboard.service.js  | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index b5d7272962..3921303930 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -10,32 +10,17 @@
  * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
  *
  */
-function clipboardService(notificationsService, eventsService) {
+function clipboardService(notificationsService, eventsService, localStorageService) {
     
     
     var STORAGE_KEY = "umbClipboardService";
     
-    var supportsLocalStorage = function () {
-        var test = "test";
-        
-        try {
-            window.localStorage.setItem(test, test);
-            window.localStorage.removeItem(test);
-            return true;
-        } catch (e) {
-            return false;
-        }
-        
-        return false;
-    }
-    
     var retriveStorage = function() {
-        if (supportsLocalStorage === false) {
+        if (localStorageService.isSupported === false) {
             return null;
         }
-        
         var dataJSON;
-        var dataString = window.localStorage.getItem(STORAGE_KEY);
+        var dataString = localStorageService.get(STORAGE_KEY);
         if (dataString != null) {
             dataJSON = JSON.parse(dataString);
         }
@@ -52,11 +37,11 @@ function clipboardService(notificationsService, eventsService) {
     }
     
     var saveStorage = function(storage) {
-        var storageString = JSON.stringify(storage)
+        var storageString = JSON.stringify(storage);
         
         try {
             var storageJSON = JSON.parse(storageString);
-            window.localStorage.setItem(STORAGE_KEY, storageString);
+            localStorageService.set(STORAGE_KEY, storageString);
             
             eventsService.emit("clipboardService.storageUpdate");
             
@@ -76,6 +61,10 @@ function clipboardService(notificationsService, eventsService) {
     * @name umbraco.services.clipboardService#copy
     * @methodOf umbraco.services.clipboardService
     *
+    * @param type {string} umbraco A string defining the type of data to storing, example: 'elementType', 'contentNode'
+    * @param alias {string} umbraco A string defining the alias of the data to store, example: 'product'
+    * @param data {object} umbraco A object containing the properties to be saved.
+    *
     * @description
     * Saves a single JS-object with a type and alias to the clipboard.
     */
@@ -116,13 +105,18 @@ function clipboardService(notificationsService, eventsService) {
     * @description
     * Determins wether the current browser is able to performe its actions.
     */
-    service.isSupported = supportsLocalStorage;
+    service.isSupported = function() {
+        return localStorageService.isSupported;
+    };
     
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#hasEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
+    * @param type {string} umbraco A string defining the type of data test for.
+    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to test for.
+    *
     * @description
     * Determins wether the current clipboard has entries that matches given type and a one of the aliases.
     */
@@ -140,6 +134,9 @@ function clipboardService(notificationsService, eventsService) {
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
+    * @param type {string} umbraco A string defining the type of data to recive.
+    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * 
     * @description
     * Returns an array of entries matching the given type and one of the provided aliases.
     */
@@ -162,6 +159,9 @@ function clipboardService(notificationsService, eventsService) {
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
+    * @param type {string} umbraco A string defining the type of data to recive.
+    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * 
     * @description
     * Returns an array of data of entries matching the given type and one of the provided aliases.
     */
@@ -174,6 +174,9 @@ function clipboardService(notificationsService, eventsService) {
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
+    * @param type {string} umbraco A string defining the type of data to remove.
+    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to remove.
+    * 
     * @description
     * Removes entries matching the given type and one of the provided aliases.
     */

From 2a592bfe8cf45215d37316c5a1677ed6cacbc35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 9 May 2019 15:30:01 +0200
Subject: [PATCH 50/56] remove comments

---
 src/Umbraco.Web.UI.Client/src/less/components/overlays.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index cfba4454df..f5050fad85 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -15,10 +15,7 @@
 }
 
 .umb-overlay .umb-overlay-header {
-    //background: @gray-10;
     border-bottom: 1px solid @purple-l3;
-    //background: @blueExtraDark;
-    //color:@u-white;
     margin-top: 0;
     flex-grow: 0;
     flex-shrink: 0;

From 66d12ddab28b453bb59597c2c5debf40f31daf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 9 May 2019 15:30:07 +0200
Subject: [PATCH 51/56] fix spelling

---
 .../src/common/services/clipboard.service.js                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 3921303930..6be9aba335 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -118,7 +118,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @param aliases {string} umbraco A array of strings providing the alias of the data you want to test for.
     *
     * @description
-    * Determins wether the current clipboard has entries that matches given type and a one of the aliases.
+    * Determines whether the current clipboard has entries that match a given type and one of the aliases.
     */
     service.hasEntriesOfType = function(type, aliases) {
         
@@ -144,7 +144,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         
         var storage = retriveStorage();
         
-        // Find entries that are furfilling the criterias for this nodeType and nodeTypesAliases.
+        // Find entries that are fulfilling the criteria for this nodeType and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
                 return (entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
@@ -184,7 +184,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         
         var storage = retriveStorage();
         
-        // Find entries that are NOT furfilling the criterias for this nodeType and nodeTypesAliases.
+        // Find entries that are NOT fulfilling the criteria for this nodeType and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
                 return !(entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);

From 8fce680430f00c9fc896e63a8348e2bcfb9810cf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 10 May 2019 13:07:06 +1000
Subject: [PATCH 52/56] removes unused line, updates gitignore

---
 .gitignore      |  1 +
 build/build.ps1 | 56 ++++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23ba01ebf0..585bd855b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@ build/temp/
 
 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/ApiDocs/api/*
diff --git a/build/build.ps1 b/build/build.ps1
index f1855833a8..55b686c98e 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -434,50 +434,47 @@
   {
     Write-Host "Prepare C# Documentation"
 	
-	$src = "$($this.SolutionRoot)\src"
-    $tmp = $this.BuildTemp
-    $out = $this.BuildOutput
-	$DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
-	$DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
+    $src = "$($this.SolutionRoot)\src"
+      $tmp = $this.BuildTemp
+      $out = $this.BuildOutput
+    $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
+    $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
 	
-	# Build the solution in debug mode
-	$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
 
 	#restore nuget packages
 	$this.RestoreNuGet()
+    # run DocFx
+    $DocFx = $this.BuildEnv.DocFx
+    
+    & $DocFx metadata $DocFxJson
+    & $DocFx build $DocFxJson
 
-	# run DocFx
-	$DocFx = $this.BuildEnv.DocFx
-	
-	& $DocFx metadata $DocFxJson
-	& $DocFx build $DocFxJson
-
-	# zip it
-	& $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
+    # zip it
+    & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
   })
   
   $ubuild.DefineMethod("PrepareAngularDocs",
   {
     Write-Host "Prepare Angular Documentation"
 	
-	$src = "$($this.SolutionRoot)\src"
-    $out = $this.BuildOutput
-	
-	$this.CompileBelle()
+    $src = "$($this.SolutionRoot)\src"
+      $out = $this.BuildOutput
+    
+    $this.CompileBelle()
 
-	"Moving to Umbraco.Web.UI.Client folder"
-	cd .\src\Umbraco.Web.UI.Client
+    "Moving to Umbraco.Web.UI.Client folder"
+    cd .\src\Umbraco.Web.UI.Client
 
-	"Generating the docs and waiting before executing the next commands"
-	& gulp docs | Out-Null
+    "Generating the docs and waiting before executing the next commands"
+    & gulp docs | Out-Null
 
-	# change baseUrl
-	$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-	$IndexPath = "./docs/api/index.html"
-	(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+    # change baseUrl
+    $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
+    $IndexPath = "./docs/api/index.html"
+    (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
 
-	# zip it
-	& $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
+    # zip it
+    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
   })
 
   $ubuild.DefineMethod("Build",
@@ -511,6 +508,7 @@
     if ($this.OnError()) { return }
     $this.PostPackageHook()
     if ($this.OnError()) { return }
+
     Write-Host "Done"
   })
 

From d9027e04f3c4712415f89605cf851a8890f919c4 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 10 May 2019 21:58:55 +0200
Subject: [PATCH 53/56] Hide "Create new" header in Nested Content create item
 dialog if all items are filtered out

---
 .../src/views/common/overlays/itempicker/itempicker.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index 0fdf303c6b..bfb5edd12c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -30,7 +30,7 @@
         </li>
     </ul>
 
-    <div class="umb-overlay__section-header" ng-if="::(model.pasteItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="(model.availableItems | filter:searchTerm).length > 0">
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>
 

From 1090d54763deb6ca69ca609476fa19b041fca388 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 14 May 2019 13:25:05 +0200
Subject: [PATCH 54/56] Update to the latest caniuse-lite to fix the build

Fixes #5455
---
 src/Umbraco.Web.UI.Client/package-lock.json | 341 +++++---------------
 src/Umbraco.Web.UI.Client/package.json      |   3 +-
 2 files changed, 76 insertions(+), 268 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 6cf4704622..c1c85a9688 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1104,7 +1104,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1113,8 +1112,7 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1540,7 +1538,6 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1550,15 +1547,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1574,7 +1569,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1763,8 +1757,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1783,7 +1776,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1795,22 +1787,19 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1826,7 +1815,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1835,15 +1823,13 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1949,9 +1935,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000913",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000913.tgz",
-      "integrity": "sha512-PP7Ypc35XY1mNduHqweGNOp0qfNUCmaQauGOYDByvirlFjrzRyY72pBRx7jnBidOB8zclg00DAzsy2H475BouQ==",
+      "version": "1.0.30000967",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz",
+      "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
       "dev": true
     },
     "canonical-path": {
@@ -1964,8 +1950,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1978,7 +1963,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1990,8 +1974,7 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2266,8 +2249,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2391,7 +2373,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2604,7 +2585,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2859,7 +2839,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2877,7 +2856,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2886,15 +2864,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2906,7 +2882,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2916,7 +2891,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2926,7 +2900,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2940,7 +2913,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2956,15 +2928,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2976,15 +2946,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2996,22 +2964,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3020,15 +2985,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3038,7 +3001,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3059,15 +3021,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3078,7 +3038,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3094,7 +3053,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3104,7 +3062,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3114,7 +3071,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3125,7 +3081,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3136,7 +3091,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3149,7 +3103,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3161,7 +3114,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3189,7 +3141,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3203,22 +3154,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3231,7 +3179,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3242,7 +3189,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3255,7 +3201,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3270,22 +3215,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3298,7 +3240,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3309,7 +3250,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3322,7 +3262,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3336,22 +3275,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3364,7 +3300,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3375,7 +3310,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3388,7 +3322,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3404,7 +3337,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3417,8 +3349,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3637,7 +3568,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3661,7 +3591,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3670,15 +3599,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3690,7 +3617,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3700,7 +3626,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3710,7 +3635,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3724,7 +3648,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3740,15 +3663,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3760,15 +3681,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3780,22 +3699,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3804,15 +3720,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3822,7 +3736,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3843,15 +3756,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3862,7 +3773,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3878,7 +3788,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3888,7 +3797,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3898,7 +3806,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3909,7 +3816,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3920,7 +3826,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3933,7 +3838,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3945,7 +3849,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3988,7 +3891,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -4001,7 +3903,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -4010,15 +3911,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4028,7 +3927,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -4044,7 +3942,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -4056,7 +3953,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -4066,8 +3962,7 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5050,7 +4945,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -5098,15 +4992,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5352,10 +5244,8 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5979,7 +5869,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6286,7 +6175,6 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6310,7 +6198,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6319,22 +6206,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6344,7 +6228,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6360,7 +6243,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6380,8 +6262,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6698,7 +6579,6 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6710,15 +6590,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6734,7 +6612,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -7352,7 +7229,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7365,15 +7241,13 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7383,7 +7257,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -8266,8 +8139,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8402,8 +8274,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8416,8 +8287,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8483,8 +8353,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8514,8 +8383,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8545,8 +8413,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8567,8 +8434,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8580,8 +8446,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8599,8 +8464,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8940,7 +8804,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8949,15 +8812,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8973,7 +8834,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9279,8 +9139,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9477,8 +9336,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9914,8 +9772,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12965,8 +12822,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13677,8 +13533,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13810,7 +13665,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13823,7 +13677,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13833,15 +13686,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13857,7 +13708,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14474,7 +14324,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14620,8 +14469,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -15126,8 +14974,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -15171,7 +15018,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -15182,7 +15028,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -15191,15 +15036,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15215,7 +15058,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15232,8 +15074,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
@@ -15411,7 +15252,6 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15425,15 +15265,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15447,7 +15285,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15456,15 +15293,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15495,7 +15330,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15529,7 +15363,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15538,15 +15371,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15559,8 +15390,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15622,7 +15452,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15638,7 +15467,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15647,15 +15475,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15665,7 +15491,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15681,7 +15506,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15786,7 +15610,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15811,8 +15634,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15885,7 +15707,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15895,7 +15716,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15912,8 +15732,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15992,7 +15811,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -16241,8 +16059,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.1.0",
@@ -16270,7 +16087,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16356,8 +16172,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16402,7 +16217,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16412,22 +16226,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16443,7 +16254,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16583,7 +16393,6 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16674,7 +16483,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16778,7 +16586,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 2eb06da9e0..ef1a9cc28d 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -77,6 +77,7 @@
     "lodash": "4.17.11",
     "marked": "^0.5.2",
     "merge-stream": "1.0.1",
-    "run-sequence": "2.2.1"
+    "run-sequence": "2.2.1",
+    "caniuse-lite": "^1.0.30000966"
   }
 }

From b503becaf3c08130db9fb3cc33c5053d0eec9975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 16 May 2019 10:27:00 +0200
Subject: [PATCH 55/56] Only show if we do have pasteable items.

---
 .../src/views/common/overlays/itempicker/itempicker.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index bfb5edd12c..a9f57fe304 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -30,7 +30,7 @@
         </li>
     </ul>
 
-    <div class="umb-overlay__section-header" ng-if="(model.availableItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="model.pasteItems.length > 0 && (model.availableItems | filter:searchTerm).length > 0">
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>
 

From 9fac00d91b0aecacbd9c4dee68d7eb231b00252f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 16 May 2019 10:50:24 +0200
Subject: [PATCH 56/56] Fixed documentation mistake

---
 .../src/common/services/clipboard.service.js  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 6be9aba335..647133f0b7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -61,9 +61,9 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.clipboardService#copy
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to storing, example: 'elementType', 'contentNode'
-    * @param alias {string} umbraco A string defining the alias of the data to store, example: 'product'
-    * @param data {object} umbraco A object containing the properties to be saved.
+    * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
+    * @param {string} alias A string defining the alias of the data to store, example: 'product'
+    * @param {object} data A object containing the properties to be saved.
     *
     * @description
     * Saves a single JS-object with a type and alias to the clipboard.
@@ -114,8 +114,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#hasEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data test for.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to test for.
+    * @param {string} type A string defining the type of data test for.
+    * @param {string} aliases A array of strings providing the alias of the data you want to test for.
     *
     * @description
     * Determines whether the current clipboard has entries that match a given type and one of the aliases.
@@ -134,8 +134,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to recive.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * @param {string} type A string defining the type of data to recive.
+    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
     * 
     * @description
     * Returns an array of entries matching the given type and one of the provided aliases.
@@ -159,8 +159,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to recive.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * @param {string} type A string defining the type of data to recive.
+    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
     * 
     * @description
     * Returns an array of data of entries matching the given type and one of the provided aliases.
@@ -174,8 +174,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to remove.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to remove.
+    * @param {string} type A string defining the type of data to remove.
+    * @param {string} aliases A array of strings providing the alias of the data you want to remove.
     * 
     * @description
     * Removes entries matching the given type and one of the provided aliases.