+
You need to add at least {{model.config.minNumber}} items
-
+
You can only have {{model.config.maxNumber}} items selected
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index 30b6fc4c8f..af1dea167a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -161,7 +161,14 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM
else {
$scope.model.value = null;
}
- angularHelper.getCurrentForm($scope).$setDirty();
+
+ setDirty();
+ }
+
+ function setDirty() {
+ if ($scope.datePickerForm) {
+ $scope.datePickerForm.datepicker.$setDirty();
+ }
}
/** Sets the value of the date picker control adn associated viewModel objects based on the model value */
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index 70c74d0391..4df8f7e596 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -31,7 +31,7 @@ angular.module('umbraco')
};
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
}
/**
@@ -67,7 +67,13 @@ angular.module('umbraco')
function onFileSelected(value, files) {
setModelValueWithSrc(value);
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
+ }
+
+ function setDirty() {
+ if ($scope.imageCropperForm) {
+ $scope.imageCropperForm.modelValue.$setDirty();
+ }
}
function imageLoaded(isCroppable, hasDimensions) {
@@ -84,7 +90,7 @@ angular.module('umbraco')
if (files && files[0]) {
$scope.imageSrc = files[0].fileSrc;
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
}
}
@@ -138,7 +144,7 @@ angular.module('umbraco')
$scope.currentPoint = null;
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
}
else {
// we have a crop open already - close the crop (this will discard any changes made)
@@ -168,7 +174,7 @@ angular.module('umbraco')
$scope.close();
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
};
function reset() {
@@ -201,7 +207,7 @@ angular.module('umbraco')
}
//set form to dirty to track changes
- $scope.imageCropperForm.$setDirty();
+ setDirty();
};
function isCustomCrop(crop) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
index 84ddf7ee3b..241d61660e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
@@ -2,6 +2,9 @@
ng-controller="Umbraco.PropertyEditors.ImageCropperController">
+
+
+
-
-
+
+
-
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f3a57224e2..ca46f30bb7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
//this controller simply tells the dialogs service to open a mediaPicker window
//with a specified callback, this callback will receive an object with a selection on it
angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
- function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService) {
+ function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, overlayService) {
var vm = this;
@@ -13,6 +13,9 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
vm.editItem = editItem;
vm.showAdd = showAdd;
+ vm.mediaItems = [];
+ let selectedIds = [];
+
//check the pre-values for multi-picker
var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
@@ -22,9 +25,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.allowAddMedia = false;
function setupViewModel() {
- $scope.mediaItems = [];
- $scope.ids = [];
-
$scope.isMultiPicker = multiPicker;
if ($scope.model.value) {
@@ -77,12 +77,12 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
- $scope.mediaItems.push(media);
+ vm.mediaItems.push(media);
if ($scope.model.config.idType === "udi") {
- $scope.ids.push(media.udi);
+ selectedIds.push(media.udi);
} else {
- $scope.ids.push(media.id);
+ selectedIds.push(media.id);
}
});
@@ -92,12 +92,14 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
}
function sync() {
- $scope.model.value = $scope.ids.join();
- removeAllEntriesAction.isDisabled = $scope.ids.length === 0;
+ $scope.model.value = selectedIds.join();
+ removeAllEntriesAction.isDisabled = selectedIds.length === 0;
}
function setDirty() {
- angularHelper.getCurrentForm($scope).$setDirty();
+ if (vm.modelValueForm) {
+ vm.modelValueForm.modelValue.$setDirty();
+ }
}
function reloadUpdatedMediaItems(updatedMediaNodes) {
@@ -105,7 +107,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// reload. We only reload the images that is already picked but has been updated.
// We have to get the entities from the server because the media
// can be edited without being selected
- $scope.mediaItems.forEach(media => {
+ vm.mediaItems.forEach(media => {
if (updatedMediaNodes.indexOf(media.udi) !== -1) {
media.loading = true;
entityResource.getById(media.udi, "Media")
@@ -155,8 +157,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
}
function remove(index) {
- $scope.mediaItems.splice(index, 1);
- $scope.ids.splice(index, 1);
+ vm.mediaItems.splice(index, 1);
+ selectedIds.splice(index, 1);
sync();
setDirty();
}
@@ -174,7 +176,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
.then(function (mediaEntity) {
// if an image is selecting more than once
// we need to update all the media items
- $scope.mediaItems.forEach(media => {
+ vm.mediaItems.forEach(media => {
if (media.id === model.mediaNode.id) {
angular.extend(media, mediaEntity);
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
@@ -208,13 +210,13 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
- $scope.mediaItems.push(media);
+ vm.mediaItems.push(media);
if ($scope.model.config.idType === "udi") {
- $scope.ids.push(media.udi);
+ selectedIds.push(media.udi);
}
else {
- $scope.ids.push(media.id);
+ selectedIds.push(media.id);
}
});
@@ -250,8 +252,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
overlayService.close();
},
submit: function () {
- $scope.mediaItems.length = 0;// AngularJS way to empty the array.
- $scope.ids.length = 0;// AngularJS way to empty the array.
+ vm.mediaItems.length = 0;// AngularJS way to empty the array.
+ selectedIds.length = 0;// AngularJS way to empty the array.
sync();
setDirty();
overlayService.close();
@@ -291,7 +293,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
// content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
// watch do all the rest.
- $scope.ids = $scope.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
+ selectedIds = vm.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
sync();
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index c09d7c7613..22a683fa49 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,11 +1,11 @@
-
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
index 73def3cc65..5362cb1f10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
@@ -18,6 +18,12 @@ function memberGroupPicker($scope, editorService, memberGroupResource){
});
}
+ function setDirty() {
+ if ($scope.modelValueForm) {
+ $scope.modelValueForm.modelValue.$setDirty();
+ }
+ }
+
$scope.openMemberGroupPicker = function() {
var memberGroupPicker = {
multiPicker: true,
@@ -32,6 +38,7 @@ function memberGroupPicker($scope, editorService, memberGroupResource){
if (newGroupIds && newGroupIds.length) {
memberGroupResource.getByIds(newGroupIds).then(function (groups) {
$scope.renderModel = _.union($scope.renderModel, groups);
+ setDirty();
editorService.close();
});
}
@@ -47,10 +54,13 @@ function memberGroupPicker($scope, editorService, memberGroupResource){
editorService.memberGroupPicker(memberGroupPicker);
};
- $scope.remove =function(index){
+ // TODO: I don't believe this is used
+ $scope.remove = function(index){
$scope.renderModel.splice(index, 1);
+ setDirty();
};
+ // TODO: I don't believe this is used
$scope.add = function (item) {
var currIds = _.map($scope.renderModel, function (i) {
return i.id;
@@ -58,11 +68,14 @@ function memberGroupPicker($scope, editorService, memberGroupResource){
if (currIds.indexOf(item) < 0) {
$scope.renderModel.push({ name: item, id: item, icon: 'icon-users' });
+ setDirty();
}
};
+ // TODO: I don't believe this is used
$scope.clear = function() {
$scope.renderModel = [];
+ setDirty();
};
function renderModelIds() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
index b1cafafb0d..5a0788149e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
@@ -1,21 +1,22 @@
-
+
-
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js
index 6662a86571..2213841ece 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js
@@ -10,6 +10,12 @@
return selected;
};
+ function setDirty() {
+ if ($scope.modelValueForm) {
+ $scope.modelValueForm.modelValue.$setDirty();
+ }
+ }
+
$scope.pickGroup = function() {
editorService.memberGroupPicker({
multiPicker: true,
@@ -24,6 +30,7 @@
$scope.model.value[group.name] = true;
});
});
+ setDirty();
editorService.close();
},
close: function () {
@@ -34,6 +41,7 @@
$scope.removeGroup = function (group) {
$scope.model.value[group] = false;
+ setDirty();
}
}
angular.module('umbraco').controller("Umbraco.PropertyEditors.MemberGroupController", memberGroupController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
index 2715e11b15..abfa628e90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
@@ -12,4 +12,9 @@
ng-click="pickGroup()">
Add
+
+
+
+
+