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
index 302378b8c0..182aa664d4 100644
--- 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
@@ -32,6 +32,15 @@ angular.module("umbraco.directives")
self.setPropertyError = function (errorMsg) {
$scope.property.propertyErrorMessage = errorMsg;
};
+
+ $scope.$on("ExposePropertyEditorAPI", function(event, api) {
+
+ //avoid eventual parent properties to capture this.
+ event.stopPropagation();
+
+ $scope.propertyActions = api.propertyActions;
+ });
+
}
};
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 647133f0b7..519bc4791e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -1,203 +1,259 @@
-/**
- * @ngdoc service
- * @name umbraco.services.clipboardService
- *
- * @requires notificationsService
- * @requires eventsService
- *
- * @description
- * Service to handle clipboard in general across the application. Responsible for handling the data both storing and retrive.
- * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
- *
- */
-function clipboardService(notificationsService, eventsService, localStorageService) {
-
-
- var STORAGE_KEY = "umbClipboardService";
-
- var retriveStorage = function() {
- if (localStorageService.isSupported === false) {
- return null;
- }
- var dataJSON;
- var dataString = localStorageService.get(STORAGE_KEY);
- if (dataString != null) {
- dataJSON = JSON.parse(dataString);
- }
-
- if(dataJSON == null) {
- dataJSON = new Object();
- }
-
- if(dataJSON.entries === undefined) {
- dataJSON.entries = [];
- }
-
- return dataJSON;
- }
-
- var saveStorage = function(storage) {
- var storageString = JSON.stringify(storage);
-
- try {
- var storageJSON = JSON.parse(storageString);
- localStorageService.set(STORAGE_KEY, storageString);
-
- eventsService.emit("clipboardService.storageUpdate");
-
- return true;
- } catch(e) {
- return false;
- }
-
- return false;
- }
-
-
- var service = {};
-
- /**
- * @ngdoc method
- * @name umbraco.services.clipboardService#copy
- * @methodOf umbraco.services.clipboardService
- *
- * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
- * @param {string} alias A string defining the alias of the data to store, example: 'product'
- * @param {object} data A object containing the properties to be saved.
- *
- * @description
- * Saves a single JS-object with a type and alias to the clipboard.
- */
- service.copy = function(type, alias, data) {
-
- var storage = retriveStorage();
-
- var shallowCloneData = Object.assign({}, data);// Notice only a shallow copy, since we dont need to deep copy. (that will happen when storing the data)
- delete shallowCloneData.key;
- delete shallowCloneData.$$hashKey;
-
- var key = data.key || data.$$hashKey || console.error("missing unique key for this content");
-
- // remove previous copies of this entry:
- storage.entries = storage.entries.filter(
- (entry) => {
- return entry.unique !== key;
- }
- );
-
- var entry = {unique:key, type:type, alias:alias, data:shallowCloneData};
- storage.entries.push(entry);
-
- if (saveStorage(storage) === true) {
- notificationsService.success("Clipboard", "Copied to clipboard.");
- } else {
- notificationsService.success("Clipboard", "Couldnt copy this data to clipboard.");
- }
-
- };
-
-
- /**
- * @ngdoc method
- * @name umbraco.services.supportsCopy#supported
- * @methodOf umbraco.services.clipboardService
- *
- * @description
- * Determins wether the current browser is able to performe its actions.
- */
- service.isSupported = function() {
- return localStorageService.isSupported;
- };
-
- /**
- * @ngdoc method
- * @name umbraco.services.supportsCopy#hasEntriesOfType
- * @methodOf umbraco.services.clipboardService
- *
- * @param {string} type A string defining the type of data test for.
- * @param {string} aliases A array of strings providing the alias of the data you want to test for.
- *
- * @description
- * Determines whether the current clipboard has entries that match a given type and one of the aliases.
- */
- service.hasEntriesOfType = function(type, aliases) {
-
- if(service.retriveEntriesOfType(type, aliases).length > 0) {
- return true;
- }
-
- return false;
- };
-
- /**
- * @ngdoc method
- * @name umbraco.services.supportsCopy#retriveEntriesOfType
- * @methodOf umbraco.services.clipboardService
- *
- * @param {string} type A string defining the type of data to recive.
- * @param {string} aliases A array of strings providing the alias of the data you want to recive.
- *
- * @description
- * Returns an array of entries matching the given type and one of the provided aliases.
- */
- service.retriveEntriesOfType = function(type, aliases) {
-
- var storage = retriveStorage();
-
- // Find entries that are fulfilling the criteria for this nodeType and nodeTypesAliases.
- var filteretEntries = storage.entries.filter(
- (entry) => {
- return (entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
- }
- );
-
- return filteretEntries;
- };
-
- /**
- * @ngdoc method
- * @name umbraco.services.supportsCopy#retriveEntriesOfType
- * @methodOf umbraco.services.clipboardService
- *
- * @param {string} type A string defining the type of data to recive.
- * @param {string} aliases A array of strings providing the alias of the data you want to recive.
- *
- * @description
- * Returns an array of data of entries matching the given type and one of the provided aliases.
- */
- service.retriveDataOfType = function(type, aliases) {
- return service.retriveEntriesOfType(type, aliases).map((x) => x.data);
- };
-
- /**
- * @ngdoc method
- * @name umbraco.services.supportsCopy#retriveEntriesOfType
- * @methodOf umbraco.services.clipboardService
- *
- * @param {string} type A string defining the type of data to remove.
- * @param {string} aliases A array of strings providing the alias of the data you want to remove.
- *
- * @description
- * Removes entries matching the given type and one of the provided aliases.
- */
- service.clearEntriesOfType = function(type, aliases) {
-
- var storage = retriveStorage();
-
- // Find entries that are NOT fulfilling the criteria for this nodeType and nodeTypesAliases.
- var filteretEntries = storage.entries.filter(
- (entry) => {
- return !(entry.type === type && aliases.filter(alias => alias === entry.alias).length > 0);
- }
- );
-
- storage.entries = filteretEntries;
-
- saveStorage(storage);
- };
-
-
-
- return service;
-}
-angular.module("umbraco.services").factory("clipboardService", clipboardService);
+/**
+ * @ngdoc service
+ * @name umbraco.services.clipboardService
+ *
+ * @requires notificationsService
+ * @requires eventsService
+ *
+ * @description
+ * Service to handle clipboard in general across the application. Responsible for handling the data both storing and retrive.
+ * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
+ *
+ */
+function clipboardService(notificationsService, eventsService, localStorageService) {
+
+
+ var STORAGE_KEY = "umbClipboardService";
+
+ var retriveStorage = function() {
+ if (localStorageService.isSupported === false) {
+ return null;
+ }
+ var dataJSON;
+ var dataString = localStorageService.get(STORAGE_KEY);
+ if (dataString != null) {
+ dataJSON = JSON.parse(dataString);
+ }
+
+ if(dataJSON == null) {
+ dataJSON = new Object();
+ }
+
+ if(dataJSON.entries === undefined) {
+ dataJSON.entries = [];
+ }
+
+ return dataJSON;
+ }
+
+ var saveStorage = function(storage) {
+ var storageString = JSON.stringify(storage);
+
+ try {
+ var storageJSON = JSON.parse(storageString);
+ localStorageService.set(STORAGE_KEY, storageString);
+
+ eventsService.emit("clipboardService.storageUpdate");
+
+ return true;
+ } catch(e) {
+ return false;
+ }
+
+ return false;
+ }
+
+ var prepareEntryForStorage = function(entryData) {
+
+ var shallowCloneData = Object.assign({}, entryData);// Notice only a shallow copy, since we dont need to deep copy. (that will happen when storing the data)
+ delete shallowCloneData.key;
+ delete shallowCloneData.$$hashKey;
+
+ return shallowCloneData;
+ }
+
+
+ var service = {};
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.clipboardService#copy
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
+ * @param {string} alias A string defining the alias of the data to store, example: 'product' or ['banana', 'apple']
+ * @param {object} data A object containing the properties to be saved.
+ *
+ * @description
+ * Saves a single JS-object with a type and alias to the clipboard.
+ */
+ service.copy = function(type, alias, entryData) {
+
+ var storage = retriveStorage();
+
+ var key = entryData.key || entryData.$$hashKey || console.error("missing unique key for this content");
+
+ // remove previous copies of this entry:
+ storage.entries = storage.entries.filter(
+ (entry) => {
+ return entry.unique !== key;
+ }
+ );
+
+ var entry = {unique:key, type:type, alias:alias, data:prepareEntryForStorage(entryData)};
+ storage.entries.push(entry);
+
+ if (saveStorage(storage) === true) {
+ notificationsService.success("Clipboard", "Copied to clipboard.");
+ } else {
+ notificationsService.success("Clipboard", "Couldnt copy this data to clipboard.");
+ }
+
+ };
+
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.clipboardService#copyArray
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data to storing, example: 'elementTypeArray', 'contentNodeArray'
+ * @param {string} aliases An array of strings defining the alias of the data to store, example: 'product' or ['banana', 'apple']
+ * @param {object} entries An array of objects of objects containing the properties to be saved.
+ * @param {string} displayLabel A string or array of string defining the alias of the data to store, example: 'product' or ['banana', 'apple']
+ *
+ * @description
+ * Saves a single JS-object with a type and alias to the clipboard.
+ */
+ service.copyArray = function(type, aliases, entries, displayLabel, key) {
+
+ var storage = retriveStorage();
+
+ // Clean up each entry
+ var copiedEntries = entries.filter(
+ (entry) => {
+ return prepareEntryForStorage(entry);
+ }
+ );
+
+ var entry = {unique:key, type:type, aliases:aliases, data:copiedEntries};
+ storage.entries.push(entry);
+
+ if (saveStorage(storage) === true) {
+ notificationsService.success("Clipboard", "Copied to clipboard.");
+ } else {
+ notificationsService.success("Clipboard", "Couldnt copy this data to clipboard.");
+ }
+
+};
+
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.supportsCopy#supported
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @description
+ * Determins wether the current browser is able to performe its actions.
+ */
+ service.isSupported = function() {
+ return localStorageService.isSupported;
+ };
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.supportsCopy#hasEntriesOfType
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data test for.
+ * @param {string} aliases A array of strings providing the alias of the data you want to test for.
+ *
+ * @description
+ * Determines whether the current clipboard has entries that match a given type and one of the aliases.
+ */
+ service.hasEntriesOfType = function(type, aliases) {
+
+ if(service.retriveEntriesOfType(type, aliases).length > 0) {
+ return true;
+ }
+
+ return false;
+ };
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.supportsCopy#retriveEntriesOfType
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data to recive.
+ * @param {string} aliases A array of strings providing the alias of the data you want to recive.
+ *
+ * @description
+ * Returns an array of entries matching the given type and one of the provided aliases.
+ */
+ service.retriveEntriesOfType = function(type, allowedAliases) {
+
+ var storage = retriveStorage();
+
+ // Find entries that are fulfilling the criteria for this nodeType and nodeTypesAliases.
+ var filteretEntries = storage.entries.filter(
+ (entry) => {
+ return (
+ entry.type === type
+ &&
+ (entry.alias && allowedAliases.filter(allowedAlias => allowedAlias === entry.alias).length > 0)
+ ||
+ (entry.aliases && entry.aliases.filter(entryAlias => allowedAliases.filter(allowedAlias => allowedAlias === entryAlias).length > 0).length > 0)
+ );
+ }
+ );
+
+ return filteretEntries;
+ };
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.supportsCopy#retriveEntriesOfType
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data to recive.
+ * @param {string} aliases A array of strings providing the alias of the data you want to recive.
+ *
+ * @description
+ * Returns an array of data of entries matching the given type and one of the provided aliases.
+ */
+ service.retriveDataOfType = function(type, aliases) {
+ return service.retriveEntriesOfType(type, aliases).map((x) => x.data);
+ };
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.supportsCopy#retriveEntriesOfType
+ * @methodOf umbraco.services.clipboardService
+ *
+ * @param {string} type A string defining the type of data to remove.
+ * @param {string} aliases A array of strings providing the alias of the data you want to remove.
+ *
+ * @description
+ * Removes entries matching the given type and one of the provided aliases.
+ */
+ service.clearEntriesOfType = function(type, aliases) {
+
+ var storage = retriveStorage();
+
+ // Find entries that are NOT fulfilling the criteria for this nodeType and nodeTypesAliases.
+ var filteretEntries = storage.entries.filter(
+ (entry) => {
+ return !(
+ entry.type === type
+ &&
+ (entry.alias && allowedAliases.filter(allowedAlias => allowedAlias === entry.alias).length > 0)
+ ||
+ (entry.aliases && entry.aliases.filter(entryAlias => allowedAliases.filter(allowedAlias => allowedAlias === entryAlias).length > 0).length > 0)
+ );
+ }
+ );
+
+ storage.entries = filteretEntries;
+
+ saveStorage(storage);
+ };
+
+
+
+ return service;
+}
+
+
+angular.module("umbraco.services").factory("clipboardService", clipboardService);
+
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
index 940daccbb6..997da7f79f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
@@ -30,7 +30,7 @@
}
.umb-property .umb-property-actions__toggle {
- margin-top: 2px;
+ margin-top: 10px;
opacity: 0;
transition: opacity 120ms;
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
index 8d2134bc37..a1bc3d904d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
@@ -5,7 +5,7 @@