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

rename copyService to clipboardService

Browse Source
This commit is contained in:
Niels Lyngsø
2019-05-06 14:18:15 +02:00
parent e9b06701cc
commit 07f4295810
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.UI.Client/src/common/services/copy.service.js
View File

@@ -1,7 +1,19 @@
function copyService(notificationsService, eventsService) {
/**
* @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) {
var STORAGE_KEY = "umbCopyService";
var STORAGE_KEY = "umbClipboardService";
var supportsLocalStorage = function () {
var test = "test";
@@ -47,7 +59,7 @@ function copyService(notificationsService, eventsService) {
var storageJSON = JSON.parse(storageString);
window.localStorage.setItem(STORAGE_KEY, storageString);
eventsService.emit("copyService.storageUpdate");
eventsService.emit("clipboardService.storageUpdate");
return true;
} catch(e) {
@@ -62,8 +74,8 @@ function copyService(notificationsService, eventsService) {
/**
* @ngdoc method
* @name umbraco.services.copyService#copy
* @methodOf umbraco.services.copyService
* @name umbraco.services.clipboardService#copy
* @methodOf umbraco.services.clipboardService
*
* @description
* Saves a JS-object to the LocalStage of copied entries.
@@ -146,4 +158,4 @@ function copyService(notificationsService, eventsService) {
return service;
}

18
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -91,10 +91,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
"contentResource",
"localizationService",
"iconHelper",
"copyService",
"clipboardService",
"eventsService",
function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, copyService, eventsService) {
function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService) {
var inited = false;
@@ -195,7 +195,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
$scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small";
$scope.overlayMenu.pasteItems = [];
var availableNodesForPaste = copyService.retriveDataOfType("elementType", contentTypeAliases);
var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", contentTypeAliases);
_.each(availableNodesForPaste, function (node) {
$scope.overlayMenu.pasteItems.push({
alias: node.contentTypeAlias,
@@ -210,8 +210,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
$scope.overlayMenu.clickClearPaste = function($event) {
$event.stopPropagation();
$event.preventDefault();
copyService.clearEntriesOfType("elementType", contentTypeAliases);
$scope.overlayMenu.pasteItems = [];// This dialog is not connected via the copyService events, so we need to update manually.
clipboardService.clearEntriesOfType("elementType", contentTypeAliases);
$scope.overlayMenu.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
};
if ($scope.overlayMenu.availableItems.length === 1 && $scope.overlayMenu.pasteItems.length === 0) {
@@ -334,7 +334,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
});
}
$scope.showCopy = copyService.supportsCopy();
$scope.showCopy = clipboardService.supportsCopy();
$scope.showPaste = false;
@@ -342,7 +342,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
syncCurrentNode();
copyService.copy("elementType", node);
clipboardService.copy("elementType", node);
$event.stopPropagation();
}
@@ -362,10 +362,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
}
function checkAbilityToPasteContent() {
$scope.showPaste = copyService.hasEntriesOfType("elementType", contentTypeAliases);
$scope.showPaste = clipboardService.hasEntriesOfType("elementType", contentTypeAliases);
}
eventsService.on("copyService.storageUpdate", checkAbilityToPasteContent);
eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
var notSupported = [
"Umbraco.Tags",