From d9584f3b9b4de5f0a30d2d88c3c3ac305744fae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Rogowicz?= <rogowicz.pawel@gmail.com>
Date: Mon, 11 Dec 2017 15:59:17 +0100
Subject: [PATCH] [BUGFIX] Change data-uid to data-state-id
Change data-uid to data-state-id because there isn't uid just state identifier
Releases: master
Resolves: #83280
Change-Id: Ia0a57c061c4cff7ce6969a5a9ccc4398b81ba202
Reviewed-on: https://review.typo3.org/55033
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
---
.../Resources/Public/JavaScript/PageTree/PageTree.js | 4 ++--
.../Public/JavaScript/PageTree/PageTreeDragDrop.js | 4 ++--
.../backend/Resources/Public/JavaScript/SvgTree.js | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTree.js b/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTree.js
index de269ce253f8..170c48c7db9c 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTree.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTree.js
@@ -199,7 +199,7 @@ define(['jquery',
PageTree.prototype.nodeRightClick = function (node) {
d3.event.preventDefault();
- var $node = $(node).closest('svg').find('.nodes .node[data-uid=' + this.stateIdentifier + ']');
+ var $node = $(node).closest('svg').find('.nodes .node[data-state-id=' + this.stateIdentifier + ']');
if ($node.length) {
ContextMenu.show(
@@ -213,7 +213,7 @@ define(['jquery',
};
PageTree.prototype.contextmenu = function (node) {
- var $node = $(node).closest('svg').find('.nodes .node[data-uid=' + this.stateIdentifier + ']');
+ var $node = $(node).closest('svg').find('.nodes .node[data-state-id=' + this.stateIdentifier + ']');
if ($node.length) {
ContextMenu.show(
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTreeDragDrop.js b/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTreeDragDrop.js
index b171d0476c32..66d8ac120961 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTreeDragDrop.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/PageTree/PageTreeDragDrop.js
@@ -91,7 +91,7 @@ define([
tree.settings.allowRecursiveDelete
) {
_this.dropZoneDelete = tree.nodesContainer
- .select('.node[data-uid="' + node.stateIdentifier + '"]')
+ .select('.node[data-state-id="' + node.stateIdentifier + '"]')
.append('g')
.attr('class', 'nodes-drop-zone')
.attr('height', tree.settings.nodeHeight);
@@ -139,7 +139,7 @@ define([
var $svg = $(this).closest('svg');
var $nodesBg = $svg.find('.nodes-bg');
var $nodesWrap = $svg.find('.nodes-wrapper');
- var $nodeBg = $nodesBg.find('.node-bg[data-uid=' + node.stateIdentifier + ']');
+ var $nodeBg = $nodesBg.find('.node-bg[data-state-id=' + node.stateIdentifier + ']');
var $nodeDd = $svg.siblings('.node-dd');
if ($nodeBg.length && (!node.isDragged)) {
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js b/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
index 123ceb6c3fd1..6cce08275c0b 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/SvgTree.js
@@ -511,7 +511,7 @@ define(
.merge(nodesBg)
.attr('width', '100%')
.attr('height', this.settings.nodeHeight)
- .attr('data-uid', this.getNodeStateIdentifier)
+ .attr('data-state-id', this.getNodeStateIdentifier)
.attr('transform', this.getNodeBgTransform)
.on('mouseover', function (node) {
_this.nodeBgEvents().mouseOver(node, this);
@@ -537,7 +537,7 @@ define(
var self = {};
self.mouseOver = function (node, element) {
- var elementNodeBg = _this.svg.select('.nodes-bg .node-bg[data-uid="' + node.stateIdentifier + '"]');
+ var elementNodeBg = _this.svg.select('.nodes-bg .node-bg[data-state-id="' + node.stateIdentifier + '"]');
node.isOver = true;
_this.settings.nodeOver.node = node;
@@ -551,7 +551,7 @@ define(
};
self.mouseOut = function (node, element) {
- var elementNodeBg = _this.svg.select('.nodes-bg .node-bg[data-uid="' + node.stateIdentifier + '"]');
+ var elementNodeBg = _this.svg.select('.nodes-bg .node-bg[data-state-id="' + node.stateIdentifier + '"]');
node.isOver = false;
_this.settings.nodeOver.node = false;
@@ -565,7 +565,7 @@ define(
};
self.click = function (node, element) {
- var $nodeBg = $(element).closest('svg').find('.nodes-bg .node-bg[data-uid=' + node.stateIdentifier + ']');
+ var $nodeBg = $(element).closest('svg').find('.nodes-bg .node-bg[data-state-id=' + node.stateIdentifier + ']');
_this.nodes.forEach(function (node) {
if (node.selected === true) {
@@ -741,7 +741,7 @@ define(
.attr('class', this.getNodeClass)
.attr('transform', this.getNodeTransform)
.attr('data-table', 'pages')
- .attr('data-uid', this.getNodeStateIdentifier)
+ .attr('data-state-id', this.getNodeStateIdentifier)
.attr('title', this.getNodeTitle)
.on('mouseover', function (node) {
_this.nodeBgEvents().mouseOver(node, this);
--
GitLab