diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 1504002245..05a6f4ca0e 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
not want this to happen as the alpha of the next major is, really, the next major already.
-->
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
index 9dff712ef6..665f315bee 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
@@ -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) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index c25dd0a76f..235918735f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -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();
- //})
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 3e94e01b3a..6dd77c56b1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -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);
}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e0660f8f12..02e24ddbb6 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -105,7 +105,7 @@
- 8.0.0-alpha.34
+ 8.0.0-alpha.35