[BUGFIX] copy/cut/ref after D'n'D action

Resolves: #200
T3Voila · Aug 14, 2018 · d656f07 · d656f07
1 parent fd48fbe
commit d656f07
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Classes/Controller/BackendLayoutController.php b/Classes/Controller/BackendLayoutController.php
@@ -1014,7 +1014,7 @@ public function buildButton($module, $title, $icon, $params = [], $buttonType =
                         ]
                     )
                 );
-                $clickUrl = 'jumpToUrl(\'' . $url . '\');return false;';
+                $clickUrl = 'jumpToUrl(\'' . trim(json_encode(rawurldecode($url), JSON_HEX_APOS | JSON_HEX_QUOT), '"') . '\');return false;';
         }
         return $this->buildButtonFromUrl($clickUrl, $title, $icon, '', $buttonType, $extraClass, $rel);
     }

diff --git a/Classes/Module/Mod1/Clipboard.php b/Classes/Module/Mod1/Clipboard.php
@@ -187,7 +187,9 @@ public function element_getSelectButtons($elementPointer, $listOfButtons = 'copy
                     'web_txtemplavoilaplusLayout',
                     $title,
                     $icon . ($isActive ? '-release' : ''),
-                    $params
+                    $params,
+                    'default',
+                    'tpm-' . $button
                 );
             }
         }

diff --git a/Resources/Public/JavaScript/templavoila.js b/Resources/Public/JavaScript/templavoila.js
@@ -165,7 +165,9 @@ function sortable_updateItemButtons(listSelector)
                 this.href = this.href.replace(/unlinkRecord\('[^']+'/, "unlinkRecord(\'" + newPos + "\'");
             }
             if ($this.hasClass('tpm-cut') || $this.hasClass('tpm-copy') || $this.hasClass('tpm-ref') ) {
-                this.href = this.href.replace(/CB\[el\]\[([^\]]+)\]=[^&]+/, "CB[el][$1]=" + newPos);
+                //this.setAttribute('onclick',  encodeURI(decodeURI(this.getAttribute('onclick')).replace(/CB\[el\]\[([^\]]+)\]=[^&]+/, "CB[el][$1]=" + newPos)));
+
+                this.setAttribute('onclick',  this.getAttribute('onclick').replace(/CB\[el\]\[([^\]]+)\]=[^&]+/, "CB[el][$1]=" + newPos));
             }
             if ($this.hasClass('tpm-pasteAfter') || $this.hasClass('tpm-pasteSubRef')) {
                 this.href = this.href.replace(/&destination=[^&]+/, "&destination=" + newPos);