Merge pull request #204 from skttl/develop

Preparing 1.2.3

Author: skttl

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.2.2.{build}
+version: 1.2.3.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Css/doctypegrideditor.css

@@ -44,3 +44,11 @@
     display: block;
 }
 */
+
+/* workaround for https://github.com/skttl/umbraco-doc-type-grid-editor/issues/199 from https://github.com/umbraco/Umbraco-CMS/issues/7754 */
+body.pre870 .dtge-dialog .umb-overlay {
+    left: inherit !important;
+    right: 0 !important;
+    top: 0 !important;
+    bottom: 0 !important;
+}

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js

@@ -151,8 +151,8 @@
 
         $scope.setPreview = function (model) {
             if ($scope.control.editor.config && "enablePreview" in $scope.control.editor.config && $scope.control.editor.config.enablePreview) {
-                var activeVariant = editorState.current.variants.find(v => v.active);
-                var culture = activeVariant ? activeVariant.language.culture : null;
+                var activeVariant = editorState.current.variants?.find(v => v.active);
+                var culture = activeVariant?.language?.culture;
                 dtgeResources.getEditorMarkupForDocTypePartial(editorState.current.id, model.id,
                     $scope.control.editor.alias, model.dtgeContentTypeAlias, model.value,
                     $scope.control.editor.config.viewPath,
@@ -252,6 +252,9 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
                 if ($scope.model.node && $scope.model.node.id > 0) {
                     // delete any temporary blueprints used for validation
                     contentResource.deleteBlueprint($scope.model.node.id);
+
+                    // set current node id, so subsequent deletes, giving 404 errors is avoided
+                    $scope.model.node.id = 0;
                 }
 
                 //clear server validation messages when this editor is destroyed
@@ -280,9 +283,10 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
                     contentEditingHelper.contentEditorPerformSave(args).then(function (data) {
                         $scope.model.submit($scope.model);
                     },
-                        function (err) {
-
-                        });
+                    function (err) {
+                        // cleanup the blueprint immediately
+                        cleanup();
+                    });
                 }
             }
             function close() {
@@ -383,6 +387,10 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
                 });
             }
 
+            if (dtgeUtilityService.compareCurrentUmbracoVersion("8.7.0", {}) && !$("body").hasClass("pre870")) {
+                $("body").addClass("pre870");
+            };
+
         }
 
     ]);