Fix [Bug] C1 CMS 6.9: {body}#xD; added to TextArea parameter value in…

… function with TextArea parameter #755
Orckestra · Oct 1, 2020 · 8faaad6 · 8faaad6
1 parent 8668c64
commit 8faaad6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js
@@ -875,7 +875,7 @@ SelectorBinding.prototype._applySearchSelection = function () {
 				else {
 
 					labelBinding = LabelBinding.newInstance(bodyDocument);
-					labelBinding.setLabel(StringBundle.getString("ui", "AspNetUiControl.Selector.NoMatchesFor").replace("{0}", this._searchString));
+					labelBinding.setLabel(StringBundle.getString("ui", "AspNetUiControl.Selector.NoMatchesFor").replace("{0}", this._searchString ? this._searchString.replace(/\$/g,'$$$$') : ''));
 					bodyBinding.add(labelBinding);
 					this._attachSelections();
 

diff --git a/Website/Composite/scripts/source/top/ui/bindings/editors/visualeditor/VisualEditorBinding.js b/Website/Composite/scripts/source/top/ui/bindings/editors/visualeditor/VisualEditorBinding.js
@@ -468,7 +468,7 @@ VisualEditorBinding.prototype.normalizeToDocument = function ( markup ) {
 
 	var result = markup;
 	if ( !this._isNormalizedDocument ( markup )) {
-		result = this._getHtmlMarkup().replace("${body}", markup);
+		result = this._getHtmlMarkup().replace('${body}', markup.replace(/\$/g,'$$$$'));
 	}
 	return result;
 }