yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes: U4-4848 If "Save and Publish" is clicked before page finishes loading, data is lost from MNTP

Browse Source
This commit is contained in:
Mads Rasmussen
2017-08-10 14:11:48 +02:00
parent ca80a0cddc
commit 125c378274
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
View File

@@ -3,6 +3,17 @@
function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper) {
var unsubscribe;
function subscribe() {
unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
var currIds = _.map($scope.renderModel, function (i) {
return $scope.model.config.idType === "udi" ? i.udi : i.id;
});
$scope.model.value = trim(currIds.join(), ",");
});
}
function trim(str, chr) {
var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
return str.replace(rgxtrim, '');
@@ -231,19 +242,13 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
}
});
};
var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
var currIds = _.map($scope.renderModel, function (i) {
return $scope.model.config.idType === "udi" ? i.udi : i.id;
});
$scope.model.value = trim(currIds.join(), ",");
});
//when the scope is destroyed we need to unsubscribe
$scope.$on('$destroy', function () {
unsubscribe();
if(unsubscribe) {
unsubscribe();
}
});
var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
@@ -266,14 +271,14 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
//everything is loaded, start the watch on the model
startWatch();
subscribe();
});
}
else {
//everything is loaded, start the watch on the model
startWatch();
subscribe();
}
function setEntityUrl(entity) {