Compare commits

..

1 Commits

@@ -249,14 +249,8 @@
};
scope.isCompositionsDialogLoading = false;
scope.openCompositionsDialog = function() {
if (scope.isCompositionsDialogLoading) {
return;
}
scope.isCompositionsDialogLoading = true;
scope.compositionsDialogModel = {
contentType: scope.model,
compositeContentTypes: scope.model.compositeContentTypes,
@@ -273,7 +267,7 @@
// remove overlay
editorService.close();
scope.isCompositionsDialogLoading = false;
},
close: function(oldModel) {
@@ -283,7 +277,7 @@
// remove overlay
editorService.close();
scope.isCompositionsDialogLoading = false;
},
selectCompositeContentType: function (selectedContentType) {
@@ -362,7 +356,6 @@
scope.compositionsDialogModel.totalContentTypes = parseInt(result, 10);
})
]).then(function() {
scope.isCompositionsDialogLoading = false;
//resolves when both other promises are done, now show it
editorService.open(scope.compositionsDialogModel);
scope.compositionsButtonState = "init";