bugfix with html special chars in pagebuilder code editor

chuckbe · Jan 8, 2020 · edc23e8 · edc23e8
1 parent 9b6f51e
commit edc23e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/views/backend/pages/pagebuilder/core.blade.php b/src/views/backend/pages/pagebuilder/core.blade.php
@@ -155,7 +155,7 @@
 	            	</div> --}}
 	            	<div class="pageblock_body" id="pageblock_body_{{ $pageblock['id'] }}" data-pbid="{{ $pageblock['id'] }}">{!! $pageblock['body'] !!}</div>
 	            	<div class="pageblock_body_raw" id="pageblock_body_raw_{{ $pageblock['id'] }}" data-pbid="{{ $pageblock['id'] }}">{!! $pageblock['raw'] !!}</div>
-	            	<div class="pageblock_body_code" id="pageblock_body_code_{{ $pageblock['id'] }}" data-pbid="{{ $pageblock['id'] }}">{{ $pageblock['raw'] }}</div>
+	            	<div class="pageblock_body_code" id="pageblock_body_code_{{ $pageblock['id'] }}" data-pbid="{{ $pageblock['id'] }}">{{ htmlspecialchars_decode($pageblock['raw']) }}</div>
 	            </div>
 			@endforeach
 	    @endif

diff --git a/src/views/backend/pages/pagebuilder/index.blade.php b/src/views/backend/pages/pagebuilder/index.blade.php
@@ -911,9 +911,9 @@ function findInObject(object, property, value) {
 			  		event.preventDefault();
 			  		//iframe.find('.pb_control_save_code').removeClass('not_shown');
 			  		//iframe.find('.pb_control_save').addClass('not_shown');
-			  		var pb_html_old = iframe.find('#pageblock_body_code_'+pb_id).html();
+			  		var pb_html_old = iframe.find('#pageblock_body_code_'+pb_id).text();
 			  		var pb_html = pb_html_old.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
-			  		//console.log('the pb html : ', pb_html);
+			  		console.log('the pb html : ', pb_html);
 			  		//iframe.find('#pageblock_body_'+pb_id).addClass('not_shown');
 			  		//iframe.find('#ace_editor_'+pb_id).removeClass('ace_editor_height_null');
 			  		//iframe.find('#ace_editor_'+pb_id).addClass('ace_editor_height_full');