|
102 | 102 | } |
103 | 103 | overlayOptions.submit = function (newModel) { |
104 | 104 |
|
105 | | - // Copy property values to scope model value |
106 | | - if (newModel.node) { |
107 | | - var value = { |
108 | | - name: newModel.editorName |
109 | | - }; |
110 | | - |
111 | | - for (var v = 0; v < newModel.node.variants.length; v++) { |
112 | | - var variant = newModel.node.variants[v]; |
113 | | - for (var t = 0; t < variant.tabs.length; t++) { |
114 | | - var tab = variant.tabs[t]; |
115 | | - for (var p = 0; p < tab.properties.length; p++) { |
116 | | - var prop = tab.properties[p]; |
117 | | - if (typeof prop.value !== "function") { |
118 | | - value[prop.alias] = prop.value; |
119 | | - } |
120 | | - } |
121 | | - } |
122 | | - } |
| 105 | + // Copy property values to scope model value |
| 106 | + if (newModel.node) { |
| 107 | + var value = { |
| 108 | + name: newModel.editorName |
| 109 | + }; |
123 | 110 |
|
124 | | - if (newModel.nameExp) { |
125 | | - var newName = newModel.nameExp(value); // Run it against the stored dictionary value, NOT the node object |
126 | | - if (newName && (newName = $.trim(newName))) { |
127 | | - value.name = newName; |
| 111 | + for (var v = 0; v < newModel.node.variants.length; v++) { |
| 112 | + var variant = newModel.node.variants[v]; |
| 113 | + for (var t = 0; t < variant.tabs.length; t++) { |
| 114 | + var tab = variant.tabs[t]; |
| 115 | + for (var p = 0; p < tab.properties.length; p++) { |
| 116 | + var prop = tab.properties[p]; |
| 117 | + if (typeof prop.value !== "function") { |
| 118 | + value[prop.alias] = prop.value; |
128 | 119 | } |
129 | 120 | } |
| 121 | + } |
| 122 | + } |
130 | 123 |
|
131 | | - newModel.dialogData.value = value; |
132 | | - } else { |
133 | | - newModel.dialogData.value = null; |
134 | | - |
| 124 | + if (newModel.nameExp) { |
| 125 | + var newName = newModel.nameExp(value); // Run it against the stored dictionary value, NOT the node object |
| 126 | + if (newName && (newName = $.trim(newName))) { |
| 127 | + value.name = newName; |
135 | 128 | } |
| 129 | + } |
136 | 130 |
|
137 | | - $scope.setValue({ |
138 | | - dtgeContentTypeAlias: newModel.dialogData.docTypeAlias, |
139 | | - value: newModel.dialogData.value, |
140 | | - id: newModel.dialogData.id |
141 | | - }); |
142 | | - $scope.setPreview($scope.control.value); |
143 | | - editorService.close(); |
| 131 | + newModel.dialogData.value = value; |
| 132 | + } else { |
| 133 | + newModel.dialogData.value = null; |
| 134 | + |
| 135 | + } |
| 136 | + |
| 137 | + $scope.setValue({ |
| 138 | + dtgeContentTypeAlias: newModel.dialogData.docTypeAlias, |
| 139 | + value: newModel.dialogData.value, |
| 140 | + id: newModel.dialogData.id |
| 141 | + }); |
| 142 | + $scope.setPreview($scope.control.value); |
| 143 | + editorService.close(); |
144 | 144 | }; |
145 | 145 |
|
146 | 146 | editorService.open(overlayOptions); |
@@ -244,7 +244,7 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT |
244 | 244 | vm.blueprintConfig = blueprintConfig; |
245 | 245 |
|
246 | 246 | function cleanup() { |
247 | | - if ($scope.model.node && $scope.model.node.id > 0){ |
| 247 | + if ($scope.model.node && $scope.model.node.id > 0) { |
248 | 248 | // delete any temporary blueprints used for validation |
249 | 249 | contentResource.deleteBlueprint($scope.model.node.id); |
250 | 250 | } |
@@ -273,10 +273,10 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT |
273 | 273 | } |
274 | 274 |
|
275 | 275 | contentEditingHelper.contentEditorPerformSave(args).then(function (data) { |
276 | | - $scope.model.submit($scope.model); |
277 | | - }, |
| 276 | + $scope.model.submit($scope.model); |
| 277 | + }, |
278 | 278 | function (err) { |
279 | | - |
| 279 | + |
280 | 280 | }); |
281 | 281 | } |
282 | 282 | } |
|
0 commit comments