yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp8' into temp8-fixes-allocations-for-property-selectors

Browse Source
This commit is contained in:
Stephan
2019-02-04 09:58:55 +01:00
parent 80165c3c0f 7fd51a298d
commit d6181b042b
5 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.nuspec
View File

@@ -22,7 +22,7 @@
not want this to happen as the alpha of the next major is, really, the next major already.
-->
<dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
<dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.34]" />
<dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.35]" />
<dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
<dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
<dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />

8
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
View File

@@ -18,6 +18,10 @@
//adds a handler to the context menu item click, we need to handle this differently
//depending on what the menu item is supposed to do.
scope.executeMenuItem = function (action) {
//the action is called as it would be by the tree. to ensure that the action targets the correct node,
//we need to set the current node in appState before calling the action. otherwise we break all actions
//that use the current node (and that's pretty much all of them)
appState.setMenuState("currentNode", scope.currentNode);
navigationService.executeMenuAction(action, scope.currentNode, scope.currentSection);
scope.dropdown.isOpen = false;
};
@@ -29,10 +33,6 @@
return;
}
//when the options item is selected, we need to set the current menu item in appState (since this is synonymous with a menu)
// Niels: No i think we are wrong, we should not set the currentNode, cause it represents the currentNode of interaction.
//appState.setMenuState("currentNode", scope.currentNode);
if (!scope.actions) {
treeService.getMenu({ treeNode: scope.currentNode })
.then(function (data) {

11
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
View File

@@ -66,14 +66,12 @@
}
editor.style._tx = 100;
//editor.style.opacity = 0;
editor.style.transform = "translateX("+editor.style._tx+"%)";
// animation config
anime({
targets: editor.style,
_tx: [100, 0],
//opacity: [0, 1],
easing: 'easeOutExpo',
duration: 480,
update: () => {
@@ -81,10 +79,8 @@
scope.$digest();
},
complete: function() {
//$timeout(function(){
editor.animating = false;
scope.$digest();
//});
editor.animating = false;
scope.$digest();
}
});
@@ -102,7 +98,6 @@
anime({
targets: editor.style,
_tx: [0, 100],
//opacity: [1, 0],
easing: 'easeInExpo',
duration: 360,
update: () => {
@@ -110,11 +105,9 @@
scope.$digest();
},
complete: function() {
//$timeout(function(){
scope.editors.splice(-1,1);
removeOverlayFromPrevEditor();
scope.$digest();
//})
}
});

2
src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
View File

@@ -17,14 +17,12 @@
}
.umb-editor--animating {
//will-change: transform, opacity, width, left;
will-change: transform, width, left;
}
// hide all infinite editors by default
// will be shown through animation
.umb-editors .umb-editor {
//opacity: 0;
box-shadow: 0px 0 30px 0 rgba(0,0,0,.3);
}

2
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -105,7 +105,7 @@
<PackageReference Include="MiniProfiler" Version="3.2.0.157" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Umbraco.ModelsBuilder.Ui">
<Version>8.0.0-alpha.34</Version>
<Version>8.0.0-alpha.35</Version>
</PackageReference>
<PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
</ItemGroup>