Skip to content

Commit

Permalink
Merge pull request #6823 from umbraco/v8/feature/6816-property-actions
Browse files Browse the repository at this point in the history
PropertyActions + Copy all entries for Nested Content
  • Loading branch information
Warren Buckley authored Oct 31, 2019
2 parents 2842c65 + 946fb38 commit ecc9e26
Show file tree
Hide file tree
Showing 20 changed files with 5,263 additions and 4,717 deletions.
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function watchTask(cb) {
//Setup a watcher for all groups of JS files
_.forEach(config.sources.js, function (group) {
if(group.watch !== false) {
watch(group.files, { ignoreInitial: true, interval: watchInterval }, function JS_Group_Compile() { return processJs(group.files, group.out); });
watch(group.files, { ignoreInitial: true, interval: watchInterval }, function JS_Group_Compile() { return processJs(group.files, group.out);});
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ angular.module("umbraco.directives")
replace: true,
templateUrl: 'views/components/property/umb-property.html',
link: function (scope) {

scope.propertyEditorAPI = {};

userService.getCurrentUser().then(function (u) {
var isAdmin = u.userGroups.indexOf('admin') !== -1;
scope.propertyAlias = (Umbraco.Sys.ServerVariables.isDebuggingEnabled === true || isAdmin) ? scope.property.alias : null;
Expand All @@ -32,6 +35,19 @@ angular.module("umbraco.directives")
self.setPropertyError = function (errorMsg) {
$scope.property.propertyErrorMessage = errorMsg;
};

var unsubscribe = $scope.$on("ExposePropertyEditorAPI", function(event, api) {

//avoid eventual parent properties to capture this.
event.stopPropagation();

$scope.propertyEditorAPI = api;
});

$scope.$on("$destroy", function () {
unsubscribe();
});

}
};
});
Loading

0 comments on commit ecc9e26

Please sign in to comment.