Merge remote-tracking branch 'origin/v8/dev' into v8/dev

umbraco · Oct 31, 2019 · 5c82968 · 5c82968
2 parents 851a4e0 + ecc9e26
commit 5c82968
Show file tree

Hide file tree

Showing 22 changed files with 5,305 additions and 4,724 deletions.
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
@@ -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);});
         }
     });
 

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
@@ -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;
@@ -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();
+                });
+
             }
         };
     });