Merge pull request #829 from siteorigin/live-editor-preview-fix

Generate preview_url before preview_content
siteorigin · Dec 5, 2020 · 7331ab0 · 7331ab0
2 parents 1319906 + a01f63f
commit 7331ab0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/inc/admin.php b/inc/admin.php
@@ -198,6 +198,8 @@ function add_meta_boxes() {
 	 */
 	function render_meta_boxes( $post ) {
 		$panels_data = $this->get_current_admin_panels_data();
+		$preview_url = SiteOrigin_Panels::preview_url();
+		$preview_content = $this->generate_panels_preview( $post->ID, $panels_data );
 		include plugin_dir_path( __FILE__ ) . '../tpl/metabox-panels.php';
 	}
 

diff --git a/tpl/metabox-panels.php b/tpl/metabox-panels.php
@@ -3,13 +3,12 @@
 $builder_id = uniqid();
 $builder_type = apply_filters( 'siteorigin_panels_post_builder_type', 'editor_attached', $post, $panels_data );
 $builder_supports = apply_filters( 'siteorigin_panels_builder_supports', array(), $post, $panels_data );
-$preview = SiteOrigin_Panels_Admin::single()->generate_panels_preview( $post->ID, $panels_data );
 ?>
 
 <div id="siteorigin-panels-metabox"
 	data-builder-type="<?php echo esc_attr( $builder_type ) ?>"
-	data-preview-url="<?php echo SiteOrigin_Panels::preview_url() ?>"
-	data-preview-markup="<?php echo esc_attr( json_encode( $preview ) ); ?>"
+	data-preview-url="<?php echo $preview_url; ?>"
+	data-preview-markup="<?php echo esc_attr( json_encode( $preview_content ) ); ?>"
 	data-builder-supports="<?php echo esc_attr( json_encode( $builder_supports ) ) ?>"
 	<?php if( !empty( $_GET['so_live_editor'] ) ) echo 'data-live-editor="1"' ?>
 	>