🐛 Fix replacement

CarbonPackages · May 11, 2018 · 2303c08 · 2303c08
1 parent 829b9d7
commit 2303c08
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Resources/Private/Fusion/Overwrite.fusion b/Resources/Private/Fusion/Overwrite.fusion
@@ -1,4 +1,8 @@
 prototype(Neos.Neos:Page) {
-    [email protected] = Carbon.Hyphen:Shy.DeletePlaceholder
-    [email protected] = Carbon.Hyphen:Shy.Replace
+    [email protected] = Carbon.Hyphen:Shy.DeletePlaceholder {
+        @position = 'end 99999'
+    }
+    [email protected] = Carbon.Hyphen:Shy.Replace {
+        @position = 'end 99999'
+    }
 }
diff --git a/Resources/Private/Fusion/Shy/AlwaysReplace.fusion b/Resources/Private/Fusion/Shy/AlwaysReplace.fusion
@@ -1,3 +1,3 @@
-prototype(Carbon.Hyphen:AlwaysReplace) < prototype(Carbon.Hyphen:Shy.Replace) {
+prototype(Carbon.Hyphen:Shy.AlwaysReplace) < prototype(Carbon.Hyphen:Shy.Replace) {
     @if.environment = true
 }
diff --git a/Resources/Private/Fusion/Shy/Replace.fusion b/Resources/Private/Fusion/Shy/Replace.fusion
@@ -2,8 +2,8 @@ prototype(Carbon.Hyphen:Shy.Replace) < prototype(Neos.Fusion:Value) {
     replace = ${Configuration.setting('Carbon.Hyphen.Shy.replace')}
     addShy = true
     regex = ${'/(?>(\S)' + this.replace + '(\S))' + Configuration.setting('Carbon.Hyphen.Shy.regex') + '/'}
-    replace = ${this.addShy ? '$1&shy;$2' : '$1$2'}
-    value = ${String.pregReplace(value, this.regex, this.replace)}
+    shy = ${this.addShy ? '$1&shy;$2' : '$1$2'}
+    value = ${String.pregReplace(value, this.regex, this.shy)}
 
     @if {
         environment = ${!this.addShy || node.context.live || node.context.currentRenderingMode.preview}