Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -103,6 +103,17 @@
                     loadContent();
                 }
             }));
+
+            evts.push(eventsService.on("editors.content.reload", function (name, args) {
+                // if this content item uses the updated doc type we need to reload the content item
+                if(args && args.node && args.node.key === $scope.content.key) {
+                    $scope.page.loading = true;
+                    loadContent().then(function() {
+                        $scope.page.loading = false;
+                    });
+                }
+            }));
+            
         }
 
         /**

src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

@@ -106,6 +106,8 @@
                 var rollback = {
                     node: scope.node,
                     submit: function(model) {
+                        const args = { node: scope.node };
+                        eventsService.emit("editors.content.reload", args);
                         editorService.close();
                     },
                     close: function() {